X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/480df2cf579c8c39453b76c8dc017b7c4ed677e2..555526fbff27722462383e12e72b7adc84423540:/include/wx/defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 17aa3cd4d1..e8fc516dc6 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -224,8 +224,13 @@
 #include "wx/setup.h"
 
 // just in case they were defined in setup.h
+#ifdef PACKAGE
 #undef PACKAGE
+#endif
+
+#ifdef VERSION
 #undef VERSION
+#endif
 
 // this has to be done after including setup.h which might
 // define __HPUX__ 1 itself
@@ -907,15 +912,20 @@ enum wxStretch
 #define wxTINY_CAPTION_VERT     0x0080
 #define wxRESIZE_BORDER         0x0040
 
+#define wxDIALOG_NO_PARENT      0x0001  // Don't make owned by apps top window
+#define wxFRAME_NO_TASKBAR      0x0002  // No taskbar button (MSW only)
+#define wxFRAME_TOOL_WINDOW     0x0004  // No taskbar button, no system menu
+
 // deprecated versions defined for compatibility reasons
 #define wxRESIZE_BOX            wxMAXIMIZE_BOX
 #define wxTHICK_FRAME           wxRESIZE_BORDER
 
+// obsolete styles, unused any more
 #define wxDIALOG_MODAL          0x0020
 #define wxDIALOG_MODELESS       0x0000
 
-// Add for normal Windows frame behaviour
-#define wxFRAME_FLOAT_ON_PARENT 0x0020
+// deprecated flag, don't use any more, defined for compatibility only
+#define wxFRAME_FLOAT_ON_PARENT 0
 
 // Context-sensitive help
 #define wxFRAME_EX_CONTEXTHELP  0x00000004
@@ -1151,12 +1161,6 @@ enum wxStretch
 #define wxSP_FULLSASH         0x0400
 #define wxSP_3D               (wxSP_3DBORDER | wxSP_3DSASH)
 
-/*
- * wxFrame extra flags
- */
-// No title on taskbar
-#define wxFRAME_TOOL_WINDOW 0x0004
-
 /*
  * wxTabCtrl flags
  */
@@ -1808,7 +1812,7 @@ typedef void *          WXLPCREATESTRUCT;
 typedef unsigned long   WXMPARAM;
 typedef unsigned long   WXMSGID;
 typedef void*           WXRESULT;
-typedef int             (*WXFARPROC)();
+//typedef int             (*WXFARPROC)();
 // some windows handles not defined by PM
 typedef unsigned long   HANDLE;
 typedef unsigned long   HICON;