Resize fine tuning

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

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index 1cb5ec51cf644725550359e116dadac2fafe5d71..c87f59f47ceeb42d6b9dfc3c987c6dd4bccef537 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -2,9 +2,8 @@
 // Name:        frame.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        frame.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -60,17 +59,21 @@ public:
   bool Destroy();
 
   virtual bool Show( bool show );
   bool Destroy();
 
   virtual bool Show( bool show );

-  virtual void Enable( bool enable );

   virtual void Centre( int direction = wxHORIZONTAL );
 
   virtual void GetClientSize( int *width, int *height ) const;
   virtual void SetClientSize( int const width, int const height );
 
   virtual void Centre( int direction = wxHORIZONTAL );
 
   virtual void GetClientSize( int *width, int *height ) const;
   virtual void SetClientSize( int const width, int const height );
 

+  virtual void SetSize( int x, int y, int width, int height,
+    int sizeFlags = wxSIZE_AUTO );
+  virtual void SetSize( int width, int height );
+    

   virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
     const wxString& name = "statusBar");
   virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id,
     const wxString& name );
   virtual wxStatusBar *GetStatusBar() const;
   virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
     const wxString& name = "statusBar");
   virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id,
     const wxString& name );
   virtual wxStatusBar *GetStatusBar() const;

+  inline void SetStatusBar(wxStatusBar *statusBar) { m_frameStatusBar = statusBar; }

   virtual void SetStatusText( const wxString &text, int number = 0 );
   virtual void SetStatusWidths( int n, const int widths_field[] );
 
   virtual void SetStatusText( const wxString &text, int number = 0 );
   virtual void SetStatusWidths( int n, const int widths_field[] );
 


@@ -78,6 +81,7 @@ public:
                                     const wxString& name = wxToolBarNameStr);
   virtual wxToolBar *OnCreateToolBar( long style, wxWindowID id, const wxString& name );
   virtual wxToolBar *GetToolBar(void) const;
                                     const wxString& name = wxToolBarNameStr);
   virtual wxToolBar *OnCreateToolBar( long style, wxWindowID id, const wxString& name );
   virtual wxToolBar *GetToolBar(void) const;

+  inline void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }

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


@@ -97,25 +101,16 @@ public:
   void OnCloseWindow( wxCloseEvent& event );
   void OnIdle(wxIdleEvent& event);
 
   void OnCloseWindow( wxCloseEvent& event );
   void OnIdle(wxIdleEvent& event);
 

-  virtual void AddChild( wxWindow *child );
+  // implementation
+  

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

-
-private:
-  friend  wxWindow;
-  friend  wxMDIChildFrame;
-  friend  wxMDIClientWindow;
-
-  // update frame's menus (called from OnIdle)
+  virtual wxPoint GetClientAreaOrigin() const;

   void DoMenuUpdates();
   void DoMenuUpdates(wxMenu* menu);
   void DoMenuUpdates();
   void DoMenuUpdates(wxMenu* menu);

-  virtual void ImplementSetPosition();

 
 

-  GtkWidget    *m_mainWindow;

   wxMenuBar    *m_frameMenuBar;
   wxStatusBar  *m_frameStatusBar;
   wxToolBar    *m_frameToolBar;
   wxMenuBar    *m_frameMenuBar;
   wxStatusBar  *m_frameStatusBar;
   wxToolBar    *m_frameToolBar;

-  int           m_toolBarHeight;
-  bool          m_addPrivateChild;   // for toolbar (and maybe menubar)

   wxString      m_title;
   wxIcon        m_icon;
 
   wxString      m_title;
   wxIcon        m_icon;