Changeset 189


Ignore:
Timestamp:
Jan 14, 2007, 10:21:52 AM (19 years ago)
Author:
cinc
Message:

Code and IDL file cleanups.

Location:
trunk/desktop
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/desktop/class_c/wpfolder.c

    r188 r189  
    6565#include "desktoptypes.h"
    6666
    67 #ifndef WPFolder
    68 typedef struct WPFolder_struct {
    69   struct nomMethodTabStruct  *mtab;
    70   gulong body[1];
    71 } WPFolderObj;
    72 #define WPFolder WPFolderObj
    73 typedef WPFolder *PWPFolder;
    74 #endif
    75 
     67#include "wpnotebook.h"
    7668#include "wpfolderwindow.h"
    77 
    7869#include "wpfolder.ih"
    7970#include "wpdatafile.h"

  • trunk/desktop/class_c/wpfolderwindow.c

    r188 r189  
    4747#include "desktoptypes.h"
    4848
    49 #ifndef WPFolder
    50 typedef struct WPFolder_struct {
    51   struct nomMethodTabStruct  *mtab;
    52   gulong body[1];
    53 } WPFolderObj;
    54 #define WPFolder WPFolderObj
    55 typedef WPFolder *PWPFolder;
    56 #endif
    57 
     49#include "wpnotebook.h"
     50#include "wpfolderwindow.h"
     51#include "wpfolder.h"
    5852#include "wpfolderwindow.ih"
     53#include "wpobject.h"
    5954
    6055NOM_Scope PGtkWidget NOMLINK impl_WPFolderWindow_wpQueryContainerHandle(WPFolderWindow* nomSelf, CORBA_Environment *ev)

  • trunk/desktop/class_c/wpnotebook.c

    r178 r189  
    4646#include "desktoptypes.h"
    4747
    48 #include "nomfolderwindow.h"
    4948#include "wpnotebook.ih"
    5049

  • trunk/desktop/class_c/wpobject.c

    r188 r189  
    5050#include <nomguitk.h>
    5151
    52 /* We have to declare this here to make PNOMFolderWindow known
    53    to wpDisplayMenu(). */
    54 #ifndef WPFolderWindow
    55 typedef struct WPFolderWindow_struct {
    56   struct nomMethodTabStruct  *mtab;
    57   gulong body[1];
    58 } WPFolderWindowObj;
    59 #define WPFolderWindow WPFolderWindowObj
    60 typedef WPFolderWindow *PWPFolderWindow;
    61 #endif
    62 
    63 #ifndef WPFolder
    64 typedef struct WPFolder_struct {
    65   struct nomMethodTabStruct  *mtab;
    66   gulong body[1];
    67 } WPFolderObj;
    68 #define WPFolder WPFolderObj
    69 typedef WPFolder *PWPFolder;
    70 #endif
    71 
    7252#include "nomwindow.h"
    7353#include "desktoptypes.h"
    7454
     55#include "wpnotebook.h"
     56#include "wpfolderwindow.h"
     57#include "wpfolder.h"
    7558#include "wpobject.ih"
    76 #include "wpfolderwindow.h"
    77 #include "wpnotebook.h"
    78 
    7959
    8060

  • trunk/desktop/class_c/wpwindow.c

    r178 r189  
    4646#include <string.h>
    4747
    48 #include "nomfolderwindow.h"
    4948#include "wpwindow.ih"
    5049

  • trunk/desktop/idl/wpfolder.idl

    r188 r189  
    4242#include "wpfilesystem.idl"
    4343#include "nomfilepath.idl"
    44 /*#include "nomfolderwindow.idl"*/
    45 
    46 #ifndef WPFolderWindow_defined
    47 #define WPFolderWindow_defined
    48 native PWPFolderWindow;
    49 #endif
    50 
    51 //NOMCLASSNAME(WPFolder);
    5244
    5345interface WPFolder : WPFileSystem

  • trunk/desktop/idl/wpnotebook.idl

    r188 r189  
    4747NOMCLASSNAME(WPNoteBook);
    4848
    49 //#include "wpobject.idl"
    5049#include "wpwindow.idl"
    5150#include "nomnotebook.idl"
    … …  
    5756  PNOMNoteBook wpQueryNoteBookObject();
    5857  void wpSetNoteBookObject(in PNOMNoteBook nomNBook);
    59   //void wpSetWPObject(in PWPObject wpObject);
    60   //PWPObject wpQueryWPObject();
    6158
    6259  NOMOVERRIDE(nomInit);
    6360
    6461  NOMINSTANCEVAR(PNOMNoteBook nomNoteBook);
     62
    6563  NOMINSTANCEVAR(PWPObject wpObject);
    6664

  • trunk/desktop/idl/wpobject.idl

    r188 r189  
    3333* ***** END LICENSE BLOCK ***** */
    3434
    35 #ifndef wpobject_idl
    36 #define wpobject_idl
     35#ifndef WPOBJECT_IDL_INCLUDED
     36#define WPOBJECT_IDL_INCLUDED
    3737
    3838#include <nomobj.idl>
    … …  
    4646#include "nomwindow.idl"
    4747
    48 #if 0
    49 #ifndef WPFolderWindow_defined
    50 #define WPFolderWindow_defined
    51 native PWPFolderWindow;
    52 #endif
    53 #endif
    54 
    5548#ifndef WPFLDRWINDOW_IDL_INCLUDED
    5649native PWPFolderWindow;
    57 #endif
    58 
    59 #if 0
    60 #ifndef WPFolder_defined
    61 #define WPFolder_defined
    62 native PWPFolder;
    63 #endif
    6450#endif
    6551
    … …  
    6854#endif
    6955
    70 #if 0
     56#if 1
    7157#ifndef WPNOTEBOOK_IDL_INCLUDED
    7258native PWPNoteBook;
    7359#endif
     60#else
     61#include "wpnotebook.idl"
    7462#endif
    75 //NOMCLASSNAME(WPObject);
    76 
    77 #include "wpnotebook.idl"
    7863
    7964interface WPObject : NOMObject
    … …  
    142127};
    143128
    144 #endif
     129#endif /* WPOBJECT_IDL_INCLUDED */
    145130
    146131

  • trunk/desktop/idl/wpwindow.idl

    r178 r189  
    4444
    4545#include <nomobj.idl>
     46#include "nomwindow.idl"
    4647
    4748NOMCLASSNAME(WPWindow);
    4849
     50#if 1
     51#ifndef WPOBJECT_IDL_INCLUDED
     52native PWPObject;
     53#endif
     54#else
    4955#include "wpobject.idl"
     56#endif
    5057
    5158interface WPWindow : NOMWindow
Note: See TracChangeset for help on using the changeset viewer.