define WM_CONTEXTMENU if the standard headers don't

[wxWidgets.git] / src / stc / PlatWX.cpp

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index b3232e6aa575dc3bed12e58b861df13b4d53d49f..af915be587990f8d1af5510e1591c659a8631a77 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -6,6 +6,9 @@
 
 #include <ctype.h>
 
+#define Point macPoint  // These names are also defined by some mac headers so
+#define Style macStyle  // change their names, and then undef before we need them
+
 #include <wx/wx.h>
 #include <wx/encconv.h>
 #include <wx/listctrl.h>
@@ -13,15 +16,14 @@
 #include <wx/image.h>
 #include <wx/imaglist.h>
 
+#undef Point
+#undef Style
+
 #include "Platform.h"
 #include "PlatWX.h"
 #include "wx/stc/stc.h"
 
 
-#ifdef __WXGTK__
-#include <gtk/gtk.h>
-#endif
-
 
 Point Point::FromLong(long lpoint) {
     return Point(lpoint & 0xFFFF, lpoint >> 16);
@@ -806,6 +808,14 @@ public:
         event.Skip();
     }
 
+#ifdef __WXMAC__
+    virtual bool Show(bool show = true) {
+        bool rv = wxWindow::Show(show);
+        GetParent()->Refresh(false);
+        return rv;
+    }
+#endif
+    
     void OnActivate(wxListEvent& WXUNUSED(event)) {
         doubleClickAction(doubleClickActionData);
     }