reverted Julian's r44600, it broke help window behavior so that it prevented apps...

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

diff --git a/include/wx/mgl/toplevel.h b/include/wx/mgl/toplevel.h
index 8ed3a91b607d24a868dedc9f912156d6276b6857..cefcd0a4f54218ef74ce6e58f72b29e09169a1d5 100644 (file)
--- a/include/wx/mgl/toplevel.h
+++ b/include/wx/mgl/toplevel.h
@@ -3,19 +3,13 @@
 // Purpose:     Top level window, abstraction of wxFrame and wxDialog
 // Author:      Vaclav Slavik
 // Id:          $Id$
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __WX_TOPLEVEL_H__
 #define __WX_TOPLEVEL_H__
 
-#ifdef __GNUG__
-    #pragma interface "toplevel.h"
-#endif
-
-
 //-----------------------------------------------------------------------------
 // wxTopLevelWindowMGL
 //-----------------------------------------------------------------------------
@@ -46,18 +40,18 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 
-    virtual ~wxTopLevelWindowMGL();
-
     // implement base class pure virtuals
-    virtual void Maximize(bool maximize = TRUE);
+    virtual void Maximize(bool maximize = true);
     virtual bool IsMaximized() const;
-    virtual void Iconize(bool iconize = TRUE);
+    virtual void Iconize(bool iconize = true);
     virtual bool IsIconized() const;
     virtual void Restore();
 
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     virtual bool IsFullScreen() const { return m_fsIsShowing; }
 
+    virtual bool Show(bool show = true);
+
     virtual void SetTitle(const wxString &title) { m_title = title; }
     virtual wxString GetTitle() const { return m_title; }
 
@@ -69,16 +63,19 @@ protected:
     void Init();
 
     wxString      m_title;
-    bool          m_fsIsShowing;         /* full screen */
+    bool          m_fsIsShowing:1;         /* full screen */
     long          m_fsSaveStyle;
     long          m_fsSaveFlag;
     wxRect        m_fsSaveFrame;
 
     // is the frame currently iconized?
-    bool          m_isIconized;
+    bool          m_isIconized:1;
     // and maximized?
-    bool          m_isMaximized;
+    bool          m_isMaximized:1;
     wxRect        m_savedFrame;
+
+    // did we sent wxSizeEvent at least once?
+    bool          m_sizeSet:1;
 };
 
 #endif // __WX_TOPLEVEL_H__