Small modifications to Vadims changes

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index baf3c4acca5e04892d04d067c2d36133bb7eb543..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
 


@@ -388,7 +391,7 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 #define wxMINIMIZE              wxICONIZE
 #define wxMAXIMIZE              0x2000
 #define wxTHICK_FRAME           0x1000
 #define wxMINIMIZE              wxICONIZE
 #define wxMAXIMIZE              0x2000
 #define wxTHICK_FRAME           0x1000

-#define wxSYSTEM_MENU           0x0800
+#define wxSYSTEM_MENU           0x0800 

 #define wxMINIMIZE_BOX          0x0400
 #define wxMAXIMIZE_BOX          0x0200
 #define wxTINY_CAPTION_HORIZ    0x0100
 #define wxMINIMIZE_BOX          0x0400
 #define wxMAXIMIZE_BOX          0x0200
 #define wxTINY_CAPTION_HORIZ    0x0100


@@ -397,14 +400,24 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 #define wxRESIZE_BORDER         0x0040
 #define wxDIALOG_MODAL          0x0020
 #define wxDIALOG_MODELESS       0x0000
 #define wxRESIZE_BORDER         0x0040
 #define wxDIALOG_MODAL          0x0020
 #define wxDIALOG_MODELESS       0x0000

+/* Add for normal Windows frame behaviour */
+#define wxFRAME_FLOAT_ON_PARENT 0x0020

 
 

-#define wxDEFAULT_FRAME_STYLE    (wxRESIZE_BORDER | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN)

 
 #if WXWIN_COMPATIBILITY
 #define wxDEFAULT_FRAME wxDEFAULT_FRAME_STYLE
 #endif
 
 
 #if WXWIN_COMPATIBILITY
 #define wxDEFAULT_FRAME wxDEFAULT_FRAME_STYLE
 #endif
 

-#define wxDEFAULT_DIALOG_STYLE  (wxSYSTEM_MENU|wxCAPTION|wxTHICK_FRAME)
+#define wxDEFAULT_FRAME_STYLE    (wxSYSTEM_MENU|wxRESIZE_BORDER | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN)
+
+#ifdef __WXMSW__
+#   define wxDEFAULT_DIALOG_STYLE  (wxSYSTEM_MENU|wxCAPTION|wxTHICK_FRAME)
+#else
+// Under Unix, the dialogs don't have a system menu. Specifying
+// wxSYSTEM_MENU here, will make a close button appear.
+#   define wxDEFAULT_DIALOG_STYLE  (wxCAPTION) 
+#endif
+

 
 /*
  * Subwindow style flags
 
 /*
  * Subwindow style flags


@@ -420,9 +433,9 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 #define wxTB_3DBUTTONS      0x8000
 #define wxTB_HORIZONTAL     0x0002
 #define wxTB_VERTICAL       0x0004
 #define wxTB_3DBUTTONS      0x8000
 #define wxTB_HORIZONTAL     0x0002
 #define wxTB_VERTICAL       0x0004

-// Flatbar/Coolbar under Win98
+// Flatbar/Coolbar under Win98/ GTK 1.2

 #define wxTB_FLAT           0x0008
 #define wxTB_FLAT           0x0008

-// use native docking
+// use native docking under GTK

 #define wxTB_DOCKABLE       0x0010
 
 /*
 #define wxTB_DOCKABLE       0x0010
 
 /*


@@ -498,6 +511,8 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 #define wxGA_PROGRESSBAR     0x0004
 #define wxGA_HORIZONTAL      wxHORIZONTAL
 #define wxGA_VERTICAL        wxVERTICAL
 #define wxGA_PROGRESSBAR     0x0004
 #define wxGA_HORIZONTAL      wxHORIZONTAL
 #define wxGA_VERTICAL        wxVERTICAL

+/* Windows only */
+#define wxGA_SMOOTH          0x0008

 
 /*
  * wxSlider flags
 
 /*
  * wxSlider flags


@@ -523,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


@@ -607,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
  */


@@ -1083,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 */


@@ -1102,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 */


@@ -1122,18 +1146,23 @@ typedef struct _GdkWindow       GdkBitmap;
 typedef struct _GdkWindow       GdkPixmap;
 typedef struct _GdkCursor       GdkCursor;
 typedef struct _GdkRegion       GdkRegion;
 typedef struct _GdkWindow       GdkPixmap;
 typedef struct _GdkCursor       GdkCursor;
 typedef struct _GdkRegion       GdkRegion;

+typedef struct _GdkDragContext  GdkDragContext;

 
 /* Stand-ins for GTK types */
 
 /* Stand-ins for GTK types */

-typedef struct _GtkWidget       GtkWidget;
-typedef struct _GtkStyle        GtkStyle;
-typedef struct _GtkAdjustment   GtkAdjustment;
-typedef struct _GtkList         GtkList;
-typedef struct _GtkToolbar      GtkToolbar;
-typedef struct _GtkTooltips     GtkTooltips;
-typedef struct _GtkNotebook     GtkNotebook;
-typedef struct _GtkNotebookPage GtkNotebookPage;
-
-#endif
+typedef struct _GtkWidget         GtkWidget;
+typedef struct _GtkStyle          GtkStyle;
+typedef struct _GtkAdjustment     GtkAdjustment;
+typedef struct _GtkList           GtkList;
+typedef struct _GtkToolbar        GtkToolbar;
+typedef struct _GtkTooltips       GtkTooltips;
+typedef struct _GtkNotebook       GtkNotebook;
+typedef struct _GtkNotebookPage   GtkNotebookPage;
+typedef struct _GtkAccelGroup     GtkAccelGroup;
+typedef        struct _GtkItemFactory    GtkItemFactory;
+typedef        struct _GtkSelectionData  GtkSelectionData;
+
+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