Fixed incorrect return type

[wxWidgets.git] / include / wx / defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 4f6f3379c1602c1ec3e708e913ac878f7a6da0ba..a67a754a5a98ed4bd5c3fcb9b7c2dcf34b6d8deb 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -185,6 +185,9 @@
     #elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100)
         // Watcom 11+ supports bool
         #define HAVE_BOOL
     #elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100)
         // Watcom 11+ supports bool
         #define HAVE_BOOL

+    #elif defined(__GNUWIN32__)
+        // Cygwin supports bool
+        #define HAVE_BOOL

     #endif // compilers
 #endif // HAVE_BOOL
 
     #endif // compilers
 #endif // HAVE_BOOL
 


@@ -535,7 +538,7 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 #define wxSB_VERTICAL        wxVERTICAL
 
 /*
 #define wxSB_VERTICAL        wxVERTICAL
 
 /*

- * wxButton flags
+ * wxButton flags (Win32 only)

  */
 #define wxBU_AUTODRAW        0x0004
 #define wxBU_NOAUTODRAW      0x0000
  */
 #define wxBU_AUTODRAW        0x0004
 #define wxBU_NOAUTODRAW      0x0000


@@ -619,6 +622,14 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 
 #define wxST_SIZEGRIP       0x0002
 
 
 #define wxST_SIZEGRIP       0x0002
 

+/*
+ * wxStaticLine flags
+ */
+#define wxLI_HORIZONTAL      wxHORIZONTAL
+#define wxLI_VERTICAL        wxVERTICAL
+
+
+

 /*
  * GDI descriptions
  */
 /*
  * GDI descriptions
  */


@@ -1095,7 +1106,8 @@ typedef int (__stdcall *WXFARPROC)();
 typedef int (*WXFARPROC)();
 #endif
 
 typedef int (*WXFARPROC)();
 #endif
 

-#endif
+typedef WXHWND WXWidget;
+#endif // MSW

 
 #ifdef __WXMOTIF__
 /* Stand-ins for X/Xt/Motif types */
 
 #ifdef __WXMOTIF__
 /* Stand-ins for X/Xt/Motif types */


@@ -1114,7 +1126,7 @@ typedef void*           WXFont;
 typedef void*           WXImage;
 typedef void*           WXCursor;
 typedef void*           WXFontList;
 typedef void*           WXImage;
 typedef void*           WXCursor;
 typedef void*           WXFontList;

-#endif
+#endif // Motif

 
 #ifdef __WXGTK__
 /* Stand-ins for GLIB types */
 
 #ifdef __WXGTK__
 /* Stand-ins for GLIB types */


@@ -1149,7 +1161,8 @@ typedef struct _GtkAccelGroup     GtkAccelGroup;
 typedef        struct _GtkItemFactory    GtkItemFactory;
 typedef        struct _GtkSelectionData  GtkSelectionData;
 
 typedef        struct _GtkItemFactory    GtkItemFactory;
 typedef        struct _GtkSelectionData  GtkSelectionData;
 

-#endif
+typedef GtkWidget *WXWidget;
+#endif // GTK

 
 // This is required because of clashing macros in windows.h, which may be
 // included before or after wxWindows classes, and therefore must be
 
 // This is required because of clashing macros in windows.h, which may be
 // included before or after wxWindows classes, and therefore must be