Trying to hide evidence of my negative programming skills...

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

diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h
index 702f5190059f0f07f0a6083b4759bed75e285d93..23dde5eab48474b4deb283597f590aea04fb42c3 100644 (file)
--- a/include/wx/gtk1/frame.h
+++ b/include/wx/gtk1/frame.h
@@ -26,24 +26,22 @@ class wxMenuBar;
 class wxToolBar;
 class wxStatusBar;
 
 class wxToolBar;
 class wxStatusBar;
 

-class wxFrame;
-

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-// wxFrame
+// wxFrameGTK

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class wxFrame : public wxFrameBase
+class wxFrameGTK : public wxFrameBase

 {
 public:
     // construction
 {
 public:
     // construction

-    wxFrame() { Init(); }
-    wxFrame(wxWindow *parent,
-            wxWindowID id,
-            const wxString& title,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = wxDEFAULT_FRAME_STYLE,
-            const wxString& name = wxFrameNameStr)
+    wxFrameGTK() { Init(); }
+    wxFrameGTK(wxWindow *parent,
+               wxWindowID id,
+               const wxString& title,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = wxDEFAULT_FRAME_STYLE,
+               const wxString& name = wxFrameNameStr)

     {
         Init();
 
     {
         Init();
 


@@ -58,7 +56,7 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 

-    virtual ~wxFrame();
+    virtual ~wxFrameGTK();

 
     // implement base class pure virtuals
     virtual void Maximize(bool maximize = TRUE);
 
     // implement base class pure virtuals
     virtual void Maximize(bool maximize = TRUE);


@@ -72,7 +70,9 @@ 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; };
 

+#if wxUSE_MENUS

     virtual void SetMenuBar( wxMenuBar *menuBar );
     virtual void SetMenuBar( wxMenuBar *menuBar );

+#endif // wxUSE_MENUS

 
 #if wxUSE_STATUSBAR
     virtual void PositionStatusBar();
 
 #if wxUSE_STATUSBAR
     virtual void PositionStatusBar();


@@ -99,13 +99,16 @@ public:
     // --------------------------
 
     // move the window to the specified location and resize it: this is called
     // --------------------------
 
     // move the window to the specified location and resize it: this is called

-    // from both DoSetSize() and DoSetClientSize() 
+    // from both DoSetSize() and DoSetClientSize()

     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual void DoMoveWindow(int x, int y, int width, int height);

-    
+

     // GTK callbacks
     virtual void GtkOnSize( int x, int y, int width, int height );
     virtual void OnInternalIdle();
 
     // GTK callbacks
     virtual void GtkOnSize( int x, int y, int width, int height );
     virtual void OnInternalIdle();
 

+    // do *not* call this to iconize the frame, this is a private function!
+    void SetIconizeState(bool iconic);
+

     wxString      m_title;
     int           m_miniEdge,
                   m_miniTitle;
     wxString      m_title;
     int           m_miniEdge,
                   m_miniTitle;


@@ -114,8 +117,6 @@ public:
     bool          m_toolBarDetached;
     bool          m_insertInClientArea;  /* not from within OnCreateXXX */
 
     bool          m_toolBarDetached;
     bool          m_insertInClientArea;  /* not from within OnCreateXXX */
 

-    bool          m_isIconized;
-

     bool          m_fsIsShowing;         /* full screen */
     long          m_fsSaveStyle;
     long          m_fsSaveFlag;
     bool          m_fsIsShowing;         /* full screen */
     long          m_fsSaveStyle;
     long          m_fsSaveFlag;


@@ -133,8 +134,11 @@ protected:
     virtual void DoSetClientSize(int width, int height);
     virtual void DoGetClientSize( int *width, int *height ) const;
 
     virtual void DoSetClientSize(int width, int height);
     virtual void DoGetClientSize( int *width, int *height ) const;
 

+    // is the frame currently iconized?
+    bool          m_isIconized;
+

 private:
 private:

-    DECLARE_DYNAMIC_CLASS(wxFrame)
+    DECLARE_DYNAMIC_CLASS(wxFrameGTK)

 };
 
 #endif // __GTKFRAMEH__
 };
 
 #endif // __GTKFRAMEH__