handle _DEBUG/NDEBUG correctly

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

diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index bf5fe88226a4fc64beec88a614403d477605595a..7e08f640cbf781c02156872fa17a3722d299bb27 100644 (file)
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -31,7 +31,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
 class WXDLLEXPORT wxTopLevelWindowBase;
 
 // Dialogs are created in a special way
-#define wxTLW_EX_DIALOG             0x00000008
+#define wxTOPLEVEL_EX_DIALOG        0x00000008
 
 // Styles for ShowFullScreen
 // (note that wxTopLevelWindow only handles wxFULLSCREEN_NOBORDER and
@@ -52,10 +52,7 @@ class WXDLLEXPORT wxTopLevelWindowBase : public wxWindow
 public:
     // construction
     wxTopLevelWindowBase();
-#ifdef __DARWIN__
-    virtual ~wxTopLevelWindowBase() {}
-#endif
-    
+
     // top level wnd state
     // --------------------
 
@@ -80,6 +77,12 @@ public:
     // set the frame icon
     virtual void SetIcon(const wxIcon& icon) { m_icon = icon; }
 
+    // maximize the window to cover entire screen
+    virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) = 0;
+    
+    // return TRUE if the frame is in fullscreen mode
+    virtual bool IsFullScreen() const = 0;
+
     /*
        for now we already have them in wxWindow, but this is wrong: these
        methods really only make sense for wxTopLevelWindow!
@@ -108,6 +111,10 @@ public:
     // so should be there for all platforms
     void OnActivate(wxActivateEvent &WXUNUSED(event)) { }
 
+#ifdef __DARWIN__
+    virtual ~wxTopLevelWindowBase() {}
+#endif
+
 protected:
     // the frame client to screen translation should take account of the
     // toolbar which may shift the origin of the client area
@@ -129,12 +136,18 @@ protected:
 
 
 // include the real class declaration
-#if defined(__WXGTK__)
+#if defined(__WXMSW__)
+    #include "wx/msw/toplevel.h"
+    #define wxTopLevelWindowNative wxTopLevelWindowMSW
+#elif defined(__WXGTK__)
     #include "wx/gtk/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowGTK
 #elif defined(__WXMGL__)
     #include "wx/mgl/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowMGL
+#elif defined(__WXMAC__)
+    #include "wx/mac/toplevel.h"
+    #define wxTopLevelWindowNative wxTopLevelWindowMac
 #endif
 
 #ifdef __WXUNIVERSAL__