Changeset 189 for trunk/desktop/class_c

Timestamp:

Jan 14, 2007, 10:21:52 AM (19 years ago)

Author:

cinc

Message:

Code and IDL file cleanups.

Location:

trunk/desktop/class_c

Files:

• wpfolder.c (modified) (1 diff)
• wpfolderwindow.c (modified) (1 diff)
• wpnotebook.c (modified) (1 diff)
• wpobject.c (modified) (1 diff)
• wpwindow.c (modified) (1 diff)

trunk/desktop/class_c/wpfolder.c

@@ -65 +65 @@
 #include "desktoptypes.h"
 
-#ifndef WPFolder
-typedef struct WPFolder_struct {
-  struct nomMethodTabStruct  *mtab;
-  gulong body[1];
-} WPFolderObj;
-#define WPFolder WPFolderObj
-typedef WPFolder *PWPFolder;
-#endif
-
+#include "wpnotebook.h"
 #include "wpfolderwindow.h"
-
 #include "wpfolder.ih"
 #include "wpdatafile.h"

trunk/desktop/class_c/wpfolderwindow.c

@@ -47 +47 @@
 #include "desktoptypes.h"
 
-#ifndef WPFolder
-typedef struct WPFolder_struct {
-  struct nomMethodTabStruct  *mtab;
-  gulong body[1];
-} WPFolderObj;
-#define WPFolder WPFolderObj
-typedef WPFolder *PWPFolder;
-#endif
-
+#include "wpnotebook.h"
+#include "wpfolderwindow.h"
+#include "wpfolder.h"
 #include "wpfolderwindow.ih"
+#include "wpobject.h"
 
 NOM_Scope PGtkWidget NOMLINK impl_WPFolderWindow_wpQueryContainerHandle(WPFolderWindow* nomSelf, CORBA_Environment *ev)

trunk/desktop/class_c/wpnotebook.c

@@ -46 +46 @@
 #include "desktoptypes.h"
 
-#include "nomfolderwindow.h"
 #include "wpnotebook.ih"
 

trunk/desktop/class_c/wpobject.c

@@ -50 +50 @@
 #include <nomguitk.h>
 
-/* We have to declare this here to make PNOMFolderWindow known
-   to wpDisplayMenu(). */
-#ifndef WPFolderWindow
-typedef struct WPFolderWindow_struct {
-  struct nomMethodTabStruct  *mtab;
-  gulong body[1];
-} WPFolderWindowObj;
-#define WPFolderWindow WPFolderWindowObj
-typedef WPFolderWindow *PWPFolderWindow;
-#endif
-
-#ifndef WPFolder
-typedef struct WPFolder_struct {
-  struct nomMethodTabStruct  *mtab;
-  gulong body[1];
-} WPFolderObj;
-#define WPFolder WPFolderObj
-typedef WPFolder *PWPFolder;
-#endif
-
 #include "nomwindow.h"
 #include "desktoptypes.h"
 
+#include "wpnotebook.h"
+#include "wpfolderwindow.h"
+#include "wpfolder.h"
 #include "wpobject.ih"
-#include "wpfolderwindow.h"
-#include "wpnotebook.h"
-
 
 

trunk/desktop/class_c/wpwindow.c

@@ -46 +46 @@
 #include <string.h>
 
-#include "nomfolderwindow.h"
 #include "wpwindow.ih"