Use new C++ sockets for everything except OS/2

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

diff --git a/include/wx/mgl/toplevel.h b/include/wx/mgl/toplevel.h
index 8ed3a91b607d24a868dedc9f912156d6276b6857..f7c47f5c6b1dfd9080b6774fec4681be8cb0b859 100644 (file)
--- a/include/wx/mgl/toplevel.h
+++ b/include/wx/mgl/toplevel.h
@@ -3,7 +3,7 @@
 // Purpose:     Top level window, abstraction of wxFrame and wxDialog
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -11,7 +11,7 @@
 #ifndef __WX_TOPLEVEL_H__
 #define __WX_TOPLEVEL_H__
 
 #ifndef __WX_TOPLEVEL_H__
 #define __WX_TOPLEVEL_H__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "toplevel.h"
 #endif
 
     #pragma interface "toplevel.h"
 #endif
 


@@ -58,6 +58,8 @@ public:
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     virtual bool IsFullScreen() const { return m_fsIsShowing; }
 
     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; }
 
     virtual void SetTitle(const wxString &title) { m_title = title; }
     virtual wxString GetTitle() const { return m_title; }
 


@@ -69,16 +71,19 @@ protected:
     void Init();
 
     wxString      m_title;
     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?
     long          m_fsSaveStyle;
     long          m_fsSaveFlag;
     wxRect        m_fsSaveFrame;
 
     // is the frame currently iconized?

-    bool          m_isIconized;
+    bool          m_isIconized:1;

     // and maximized?
     // and maximized?

-    bool          m_isMaximized;
+    bool          m_isMaximized:1;

     wxRect        m_savedFrame;
     wxRect        m_savedFrame;

+
+    // did we sent wxSizeEvent at least once?
+    bool          m_sizeSet:1;

 };
 
 #endif // __WX_TOPLEVEL_H__
 };
 
 #endif // __WX_TOPLEVEL_H__