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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index c9d5b84ef3..f991cbe8a1 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -1179,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 | \
@@ -1817,7 +1813,8 @@ enum wxKeyCode
 
     WXK_WINDOWS_LEFT,
     WXK_WINDOWS_RIGHT,
-    WXK_WINDOWS_MENU
+    WXK_WINDOWS_MENU ,
+    WXK_COMMAND
 };
 
 #if wxUSE_HOTKEY
@@ -2097,8 +2094,10 @@ 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);
@@ -2173,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. */
@@ -2206,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