Changeset 178

Timestamp:

Jan 6, 2007, 3:25:06 PM (19 years ago)

Author:

cinc

Message:

Created desktop window class WPWindow.

Location:

trunk/desktop

Files:

• Makefile (modified) (1 diff)
• class_c/wpnotebook.c (modified) (1 diff)
• class_c/wpwindow.c (added)
• exports.def (modified) (1 diff)
• idl/wpnotebook.idl (modified) (2 diffs)
• idl/wpwindow.idl (added)
• make.inc (deleted)

trunk/desktop/Makefile

@@ -39 +39 @@
                         $(OBJDIR)/wpdatafile.o \
                         $(OBJDIR)/wpfolder.o \
+                        $(OBJDIR)/wpwindow.o \
                         $(OBJDIR)/wpnotebook.o \
                         $(OBJDIR)/wpclassmanager.o \

trunk/desktop/class_c/wpnotebook.c

@@ -65 +65 @@
 
 
-NOM_Scope void NOMLINK impl_WPNoteBook_wpSetWPObject(WPNoteBook* nomSelf, const PWPObject wpObject,
-                                                     CORBA_Environment *ev)
-{
-  WPNoteBookData* nomThis=WPNoteBookGetData(nomSelf);
-  _wpObject=wpObject;
-
-}
-
-
-NOM_Scope PWPObject NOMLINK impl_WPNoteBook_wpQueryWPObject(WPNoteBook* nomSelf, CORBA_Environment *ev)
-{
-  WPNoteBookData* nomThis=WPNoteBookGetData(nomSelf);
-
-  return _wpObject;
-}
-
-
-
-
 NOM_Scope void NOMLINK impl_WPNoteBook_nomInit(WPNoteBook* nomSelf, CORBA_Environment *ev)
 {

trunk/desktop/exports.def

@@ -37 +37 @@
         WPNoteBookNewClass
 
+        _WPWindowClassData
+        _WPWindowCClassData
+        WPWindowNewClass
+
 ;IMPORTS

trunk/desktop/idl/wpnotebook.idl

@@ -47 +47 @@
 NOMCLASSNAME(WPNoteBook);
 
-#include "wpobject.idl"
+//#include "wpobject.idl"
+#include "wpwindow.idl"
 #include "nomnotebook.idl"
 
 
-interface WPNoteBook : NOMWindow
+interface WPNoteBook : WPWindow
 {
   NOMCLASSVERSION(1, 0);
@@ -57 +58 @@
   PNOMNoteBook wpQueryNoteBookObject();
   void wpSetNoteBookObject(in PNOMNoteBook nomNBook);
-  void wpSetWPObject(in PWPObject wpObject);
-  PWPObject wpQueryWPObject();
+  //void wpSetWPObject(in PWPObject wpObject);
+  //PWPObject wpQueryWPObject();
 
   NOMOVERRIDE(nomInit);