A few tweaks and cleanups

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

diff --git a/include/wx/frame.h b/include/wx/frame.h
index 45da824821826ced1ab57fa24166fc673a0ca98b..ac7e48f61c5036e0cadbd20df82c25fb197dfa87 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -54,9 +54,7 @@ class WXDLLEXPORT wxFrameBase : public wxTopLevelWindow
 public:
     // construction
     wxFrameBase();
-#ifdef __DARWIN__
-    virtual ~wxFrameBase() { }
-#endif
+    virtual ~wxFrameBase();
 
     wxFrame *New(wxWindow *parent,
                  wxWindowID id,
@@ -142,6 +140,17 @@ public:
     void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);
 #endif // wxUSE_MENUS
 
+    // if there is no real wxTopLevelWindow on this platform we have to define
+    // some wxTopLevelWindowBase pure virtual functions here to avoid breaking
+    // old ports (wxMotif) which don't define them in wxFrame
+#ifndef wxTopLevelWindowNative
+    virtual bool ShowFullScreen(bool WXUNUSED(show),
+                                long WXUNUSED(style) = wxFULLSCREEN_ALL)
+        { return FALSE; }
+    virtual bool IsFullScreen() const
+        { return FALSE; }
+#endif // no wxTopLevelWindowNative
+
 protected:
     // the frame main menu/status/tool bars
     // ------------------------------------
@@ -192,7 +201,7 @@ protected:
 };
 
 // include the real class declaration
-#ifdef __WXUNIVERSAL__
+#if defined(__WXUNIVERSAL__) // && !defined(__WXMICROWIN__)
     #include "wx/univ/frame.h"
 #else // !__WXUNIVERSAL__
     #if defined(__WXMSW__)