Lots of wxMotif fixes

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

diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h
index 07e4e586ff482da2534fd6edbc39e600871b3e35..05796513d96e05a603b23477559a5a6ceaf041d2 100644 (file)
--- a/include/wx/gtk1/frame.h
+++ b/include/wx/gtk1/frame.h
@@ -2,10 +2,9 @@
 // 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
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart
+// Licence:     wxWindows licence

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


@@ -19,14 +18,17 @@
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/window.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/window.h"

-#include "wx/menu.h"
-#include "wx/statusbr.h"

 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxMDIChildFrame;
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxMDIChildFrame;

+class wxMDIClientWindow;
+class wxMenu;
+class wxMenuBar;
+class wxToolBar;
+class wxStatusBar;

 
 class wxFrame;
 
 
 class wxFrame;
 


@@ -35,6 +37,7 @@ class wxFrame;
 //-----------------------------------------------------------------------------
 
 extern const char *wxFrameNameStr;
 //-----------------------------------------------------------------------------
 
 extern const char *wxFrameNameStr;

+extern const char *wxToolBarNameStr;

 
 //-----------------------------------------------------------------------------
 // wxFrame
 
 //-----------------------------------------------------------------------------
 // wxFrame


@@ -43,55 +46,78 @@ extern const char *wxFrameNameStr;
 class wxFrame: public wxWindow
 {
   DECLARE_DYNAMIC_CLASS(wxFrame)
 class wxFrame: public wxWindow
 {
   DECLARE_DYNAMIC_CLASS(wxFrame)

+public:

 
 

-  public:
+  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();
+
+  virtual bool Show( bool show );
+  virtual void Centre( int direction = wxHORIZONTAL );
+
+  virtual void GetClientSize( int *width, int *height ) const;
+  wxSize GetClientSize() const { int w, h; GetClientSize(& w, & h); return wxSize(w, h); }

   
   

-    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 OnIdle( wxIdleEvent &event );
-    
-  //private:    
-    
-    virtual void GtkOnSize( int x, int y, int width, int height );
-    void DoMenuUpdates(void);
-    void DoMenuUpdates(wxMenu* menu);
-    
+  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 );

     
     

-  private:
+  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 wxToolBar* CreateToolBar( long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1,
+                                    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 SetTitle( const wxString &title );
+  virtual wxString GetTitle() const { return m_title; }
+
+  virtual void SetIcon( const wxIcon &icon );
+  virtual void Iconize( bool WXUNUSED(iconize)) { }
+  virtual bool IsIconized(void) const { return FALSE; }
+  bool Iconized(void) const { return IsIconized(); }
+  virtual void Maximize(bool WXUNUSED(maximize)) {}
+  virtual void Restore(void) {}
+
+  void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
+  void OnSize( wxSizeEvent &event );
+  void OnCloseWindow( wxCloseEvent& event );
+  void OnIdle(wxIdleEvent& event );
+
+  // implementation

   
   

-    friend        wxWindow;
-    friend        wxMDIChildFrame;
-    
-    wxMenuBar    *m_frameMenuBar;
-    GtkWidget    *m_mainWindow;
-    wxStatusBar  *m_frameStatusBar;
-    bool          m_doingOnSize;
-    wxString      m_title;
-    
-    
+  virtual void GtkOnSize( int x, int y, int width, int height );
+  virtual wxPoint GetClientAreaOrigin() const;
+  void DoMenuUpdates();
+  void DoMenuUpdates(wxMenu* menu);
+
+  wxMenuBar    *m_frameMenuBar;
+  wxStatusBar  *m_frameStatusBar;
+  wxToolBar    *m_frameToolBar;
+  wxString      m_title;
+  wxIcon        m_icon;
+  int           m_miniEdge,m_miniTitle;
+

   DECLARE_EVENT_TABLE()
   DECLARE_EVENT_TABLE()

-    

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