scrollbar support added (experimental)

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

diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h
index 42b6adb9a9f3d9c8b1801e7a446950d21d5e1aa5..e98c4acd1768822467cf5f5f2e91d112d89e0d46 100644 (file)
--- a/include/wx/gtk1/frame.h
+++ b/include/wx/gtk1/frame.h
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // Id:
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Created:     01/02/97
 // Id:
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -26,7 +26,7 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class wxRadioBox;
+class wxMDIChildFrame;

 
 class wxFrame;
 
 
 class wxFrame;
 


@@ -42,49 +42,68 @@ extern const char *wxFrameNameStr;
 
 class wxFrame: public wxWindow
 {
 
 class wxFrame: public wxWindow
 {

-  DECLARE_DYNAMIC_CLASS(wxFrame)
+public:
+  // construction
+  wxFrame();
+  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 );
+  bool Create( wxWindow *parent, wxWindowID id, const wxString &title,
+    const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
+    long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
+  ~wxFrame();
+  bool Destroy();
+
+  // operations
+    //
+  virtual bool Show( bool show );
+  virtual void Enable( bool enable );
+
+    // frame size
+  virtual void GetClientSize( int *width, int *height ) const;
+    // set minimal size for the frame (@@@ other params not implemented)
+  void SetSizeHints(int minW, int minH,
+                    int maxW = -1, int maxH = -1,
+                    int incW = -1);
+
+    // status bar
+  virtual bool CreateStatusBar( int number = 1 );
+  wxStatusBar *GetStatusBar();
+  virtual void SetStatusText( const wxString &text, int number = 0 );
+  virtual void SetStatusWidths( int n, int *width );
+
+    // menu bar
+  void SetMenuBar( wxMenuBar *menuBar );
+  wxMenuBar *GetMenuBar();
+
+    // frame title
+  void SetTitle( const wxString &title );
+  wxString GetTitle() const { return m_title; }

 
 

-  public:
-  
-    wxFrame(void);
-    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 );
-    bool Create( wxWindow *parent, wxWindowID id, const wxString &title,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
-      long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
-    ~wxFrame(void);
-    bool Destroy(void);
-    void OnCloseWindow( wxCloseEvent& event );
-    virtual bool Show( bool show );
-    virtual void Enable( bool enable );
-    virtual void GetClientSize( int *width, int *height ) const;
-    void OnSize( wxSizeEvent &event );
-    void SetMenuBar( wxMenuBar *menuBar );
-    virtual bool CreateStatusBar( int number = 1 );
-    virtual void SetStatusText( const wxString &text, int number = 0 );
-    virtual void SetStatusWidths( int n, int *width );
-    wxStatusBar *GetStatusBar(void);
-    wxMenuBar *GetMenuBar(void);
-    void SetTitle( const wxString &title );
-    wxString GetTitle(void) const;
-    void OnActivate( wxActivateEvent &WXUNUSED(event) ) {};
-    
-    void GtkOnSize( int width, int height );
-    
-  private:
-  
-    friend        wxWindow;
-    
-    GtkWidget    *m_mainWindow;
-    wxMenuBar    *m_frameMenuBar;
-    wxStatusBar  *m_frameStatusBar;
-    bool          m_doingOnSize;
-    wxString      m_title;
-    
-    
+  // implementation
+  void OnActivate( wxActivateEvent &event ) { } // called from docview.cpp
+  void OnSize( wxSizeEvent &event );
+  void OnCloseWindow( wxCloseEvent& event );
+  void OnIdle(wxIdleEvent& event);
+
+  virtual void GtkOnSize( int x, int y, int width, int height );
+
+private:
+  friend  wxWindow;
+  friend  wxMDIChildFrame;
+
+  // update frame's menus (called from OnIdle)
+  void DoMenuUpdates();
+  void DoMenuUpdates(wxMenu* menu);
+
+  GtkWidget    *m_mainWindow;
+  wxMenuBar    *m_frameMenuBar;
+  wxStatusBar  *m_frameStatusBar;
+  bool          m_doingOnSize;
+  wxString      m_title;
+
+  DECLARE_DYNAMIC_CLASS(wxFrame)

   DECLARE_EVENT_TABLE()
   DECLARE_EVENT_TABLE()

-    

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