X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f2c16a0b2cf3403a0814a4e3a845081afbc27d8c..0508ba2a6b5806ce54ba290d9c651d09433e15a9:/include/wx/defs.h?ds=sidebyside

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 9b52f03dc5..786572f161 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -191,7 +191,7 @@ typedef int wxWindowID;
 // ----------------------------------------------------------------------------
 
     // Every ride down a slippery slope begins with a single step..
-    // 
+    //
     // Yes, using nested classes is indeed against our coding standards in
     // general, but there are places where you can use them to advantage
     // without totally breaking ports that cannot use them.  If you do, then
@@ -235,16 +235,19 @@ typedef int wxWindowID;
     #define wxCALLBACK
 #endif // platform
 
-// callling convention for the qsort(3) callback
+// generic calling convention for the extern "C" functions
 
 #if defined(__VISUALC__)
-  #define   wxCMPFUNC_CONV    _cdecl
+  #define   wxC_CALLING_CONV    _cdecl
 #elif defined(__VISAGECPP__)
-  #define   wxCMPFUNC_CONV    _Optlink
+  #define   wxC_CALLING_CONV    _Optlink
 #else   // !Visual C++
-  #define   wxCMPFUNC_CONV
+  #define   wxC_CALLING_CONV
 #endif  // compiler
 
+// callling convention for the qsort(3) callback
+#define wxCMPFUNC_CONV wxC_CALLING_CONV
+
 // compatibility :-(
 #define CMPFUNC_CONV wxCMPFUNC_CONV
 
@@ -272,6 +275,11 @@ typedef int wxWindowID;
         #define WXEXPORT _Export
         #define WXIMPORT _Export
     #endif
+#elif defined(__WXMAC__)    
+    #ifdef __MWERKS__
+        #define WXEXPORT __declspec(export)
+        #define WXIMPORT __declspec(import)
+    #endif
 #endif
 
 // for other platforms/compilers we don't anything
@@ -861,6 +869,11 @@ enum wxBorder
 // parent is destroyed before the child
 #define wxWS_EX_TRANSIENT               0x00000004
 
+// Use this style to add a context-sensitive help to the window (currently for
+// Win32 only and it doesn't work if wxMINIMIZE_BOX or wxMAXIMIZE_BOX are used)
+#define wxFRAME_EX_CONTEXTHELP  0x00000004
+#define wxDIALOG_EX_CONTEXTHELP 0x00000004
+
 /*
  * wxFrame/wxDialog style flags
  */
@@ -891,10 +904,6 @@ enum wxBorder
 // 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
-#define wxDIALOG_EX_CONTEXTHELP 0x00000004
-
 /*
  * MDI parent frame style flags
  * Can overlap with some of the above.
@@ -911,7 +920,7 @@ enum wxBorder
    wxMINIMIZE_BOX | wxMAXIMIZE_BOX | \
    wxCAPTION | wxCLIP_CHILDREN)
 
-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXPM__)
 #   define wxDEFAULT_DIALOG_STYLE  (wxSYSTEM_MENU | wxCAPTION)
 #else
 //  Under Unix, the dialogs don't have a system menu. Specifying wxSYSTEM_MENU
@@ -1118,12 +1127,6 @@ enum wxBorder
 // be modal. No progress will then be made at all.
 #define wxPD_REMAINING_TIME     0x0040
 
-/*
- * wxHtmlWindow flags
- */
-#define wxHW_SCROLLBAR_NEVER    0x0002
-#define wxHW_SCROLLBAR_AUTO     0x0004
-
 /*
  * extended dialog specifiers. these values are stored in a different
  * flag and thus do not overlap with other style flags. note that these
@@ -1642,7 +1645,7 @@ typedef enum {
 #endif
 
 // macro to specify "All Files" on different platforms
-#if defined(__WXMSW__)
+#if defined(__WXMSW__) || defined(__WXPM__)
 #   define wxALL_FILES_PATTERN   "*.*"
 #   define wxALL_FILES           gettext_noop("All files (*.*)|*.*")
 #else
@@ -1774,8 +1777,15 @@ typedef int             (__stdcall *WXFARPROC)();
 
 
 #if defined(__WXPM__)
+#ifdef __EMX__
+/* Need a well-known type for WXFARPROC
+   below. MPARAM is typedef'ed too late. */
+#define WXWPARAM        void *
+#define WXLPARAM        void *
+#else
 #define WXWPARAM        MPARAM
 #define WXLPARAM        MPARAM
+#endif
 #define RECT            RECTL
 #define LOGFONT         FATTRS
 #define LOWORD          SHORT1FROMMP
@@ -1833,6 +1843,9 @@ typedef struct tagLOGPALETTE
     // VA 3.0 for some reason needs base data types when typedefing a proc proto???
 typedef void* (_System *WXFARPROC)(unsigned long, unsigned long, void*, void*);
 #else
+#ifdef __EMX__
+#define _System
+#endif
 typedef WXRESULT (_System *WXFARPROC)(WXHWND, WXMSGID, WXWPARAM, WXLPARAM);
 #endif
 
@@ -1876,6 +1889,7 @@ typedef struct _GdkColor        GdkColor;
 typedef struct _GdkColormap     GdkColormap;
 typedef struct _GdkFont         GdkFont;
 typedef struct _GdkGC           GdkGC;
+typedef struct _GdkVisual       GdkVisual;
 #ifdef __WXGTK20__
 typedef struct _GdkDrawable     GdkWindow;
 typedef struct _GdkDrawable     GdkBitmap;