Cleaned up remains of outdated 3D effect handling.

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 88611b9a83836d1c920ac85c5129325fdcebd4c3..f991cbe8a142ca463d92007ce4776496041814cd 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DEFS_H_
 #define _WX_DEFS_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "defs.h"
 #endif
 
@@ -85,6 +85,11 @@
 #   pragma suppress 571             // Virtual function hiding
 #endif // __SALFORDC__
 
+// suppress some Borland C++ warnings
+#ifdef __BORLANDC__
+#   pragma warn -inl                // Functions containing reserved words and certain constructs are not expanded inline
+#endif // __BORLANDC__
+
 // ----------------------------------------------------------------------------
 // wxWindows version and compatibility defines
 // ----------------------------------------------------------------------------
@@ -160,7 +165,7 @@
     #elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100)
         // Watcom 11+ supports bool
         #define HAVE_BOOL
-    #elif defined(__DIGITALMARS__) 
+    #elif defined(__DIGITALMARS__)
         // DigitalMars supports bool
         #define HAVE_BOOL
     #elif defined(__GNUWIN32__) || defined(__MINGW32__) || defined(__CYGWIN__)
@@ -291,7 +296,7 @@ typedef int wxWindowID;
         #define HAVE_STD_STRING_COMPARE
     #elif ( defined(__MINGW32__) || defined(__CYGWIN32__) ) \
           && wxCHECK_GCC_VERSION(3, 1)
-        // GCC 3.1 has std::string::compare; 
+        // GCC 3.1 has std::string::compare;
         // 3.0 never was in MinGW, 2.95 hasn't it
         #define HAVE_STD_STRING_COMPARE
     #endif
@@ -400,6 +405,8 @@ typedef int wxWindowID;
     #define WXMAKINGDLL_NET
     #define WXMAKINGDLL_CORE
     #define WXMAKINGDLL_ADV
+    #define WXMAKINGDLL_ODBC
+    #define WXMAKINGDLL_DBGRID
     #define WXMAKINGDLL_HTML
     #define WXMAKINGDLL_XML
 #endif // WXMAKINGDLL
@@ -450,6 +457,28 @@ typedef int wxWindowID;
     #define WXDLLIMPEXP_DATA_ADV(type) type
 #endif
 
+#ifdef WXMAKINGDLL_ODBC
+    #define WXDLLIMPEXP_ODBC WXEXPORT
+    #define WXDLLIMPEXP_DATA_ODBC(type) WXEXPORT type
+#elif defined(WXUSINGDLL)
+    #define WXDLLIMPEXP_ODBC WXIMPORT
+    #define WXDLLIMPEXP_DATA_ODBC(type) WXIMPORT type
+#else // not making nor using DLL
+    #define WXDLLIMPEXP_ODBC
+    #define WXDLLIMPEXP_DATA_ODBC(type) type
+#endif
+
+#ifdef WXMAKINGDLL_DBGRID
+    #define WXDLLIMPEXP_DBGRID WXEXPORT
+    #define WXDLLIMPEXP_DATA_DBGRID(type) WXEXPORT type
+#elif defined(WXUSINGDLL)
+    #define WXDLLIMPEXP_DBGRID WXIMPORT
+    #define WXDLLIMPEXP_DATA_DBGRID(type) WXIMPORT type
+#else // not making nor using DLL
+    #define WXDLLIMPEXP_DBGRID
+    #define WXDLLIMPEXP_DATA_DBGRID(type) type
+#endif
+
 #ifdef WXMAKINGDLL_HTML
     #define WXDLLIMPEXP_HTML WXEXPORT
     #define WXDLLIMPEXP_DATA_HTML(type) WXEXPORT type
@@ -1150,10 +1179,6 @@ enum wxBorder
 
 #define wxFRAME_NO_WINDOW_MENU  0x0100
 
-#if WXWIN_COMPATIBILITY
-#define wxDEFAULT_FRAME wxDEFAULT_FRAME_STYLE
-#endif
-
 #define wxDEFAULT_FRAME_STYLE \
   (wxSYSTEM_MENU | wxRESIZE_BORDER | \
    wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxCLOSE_BOX | \
@@ -1788,7 +1813,8 @@ enum wxKeyCode
 
     WXK_WINDOWS_LEFT,
     WXK_WINDOWS_RIGHT,
-    WXK_WINDOWS_MENU
+    WXK_WINDOWS_MENU ,
+    WXK_COMMAND
 };
 
 #if wxUSE_HOTKEY
@@ -2068,11 +2094,15 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSImage);
 DECLARE_WXCOCOA_OBJC_CLASS(NSLayoutManager);
 DECLARE_WXCOCOA_OBJC_CLASS(NSMenu);
 DECLARE_WXCOCOA_OBJC_CLASS(NSMenuItem);
+DECLARE_WXCOCOA_OBJC_CLASS(NSMutableArray);
 DECLARE_WXCOCOA_OBJC_CLASS(NSPanel);
+DECLARE_WXCOCOA_OBJC_CLASS(NSScrollView);
+DECLARE_WXCOCOA_OBJC_CLASS(NSTableColumn);
 DECLARE_WXCOCOA_OBJC_CLASS(NSTableView);
 DECLARE_WXCOCOA_OBJC_CLASS(NSTextContainer);
 DECLARE_WXCOCOA_OBJC_CLASS(NSTextField);
 DECLARE_WXCOCOA_OBJC_CLASS(NSTextStorage);
+DECLARE_WXCOCOA_OBJC_CLASS(NSThread);
 DECLARE_WXCOCOA_OBJC_CLASS(NSWindow);
 DECLARE_WXCOCOA_OBJC_CLASS(NSView);
 typedef WX_NSView WXWidget; // wxWindows BASE definition
@@ -2142,7 +2172,7 @@ typedef int             (__stdcall *WXFARPROC)();
 #endif // __WXMSW__
 
 
-#if defined(__WXPM__)
+#if defined(__WXPM__) || defined(__EMX__)
 #ifdef __EMX__
 /* Need a well-known type for WXFARPROC
    below. MPARAM is typedef'ed too late. */
@@ -2175,7 +2205,9 @@ typedef unsigned long   HIMAGELIST;
 typedef unsigned long   HGLOBAL;
 typedef unsigned long   DWORD;
 typedef unsigned short  WORD;
+#endif // WXPM || EMX
 
+#if defined (__WXPM__)
 // WIN32 graphics types for OS/2 GPI
 
 // RGB under OS2 is more like a PALETTEENTRY struct under Windows so we need a real RGB def