Applied Russel's changes to wxToolBarBase

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

diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h
index 2c64cb50ffef8c1b9988dd3a656654a9297ddf0b..829a83fc5f1ed87f22bf0844042de978bdf1901a 100644 (file)
--- a/include/wx/gtk1/frame.h
+++ b/include/wx/gtk1/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
 /////////////////////////////////////////////////////////////////////////////
 


@@ -19,6 +18,7 @@
 #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/icon.h"

 
 //-----------------------------------------------------------------------------
 // classes
 
 //-----------------------------------------------------------------------------
 // classes


@@ -60,56 +60,65 @@ 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 GetClientSize( int *width, int *height ) const;

-  
-    // set minimal/maxmimal size for the frame
-  virtual void SetSizeHints( int minW, int minH, int maxW, int maxH, int incW = -1 );
+  wxSize GetClientSize() const { int w, h; GetClientSize(& w, & h); return wxSize(w, h); }
+
+  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* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
     const wxString& name = "statusBar");

-  virtual wxStatusBar *GetStatusBar();
+  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 SetStatusText( const wxString &text, int number = 0 );

-  virtual void SetStatusWidths( int n, int *width );
+  virtual void SetStatusWidths( int n, const int widths_field[] );

 
 

-  virtual wxToolBar* CreateToolBar( long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1, 
+  virtual wxToolBar* CreateToolBar( long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1,

                                     const wxString& name = wxToolBarNameStr);
                                     const wxString& name = wxToolBarNameStr);

-  virtual wxToolBar *GetToolBar();
-  
+  virtual wxToolBar *OnCreateToolBar( long style, wxWindowID id, const wxString& name );
+  virtual wxToolBar *GetToolBar() const;
+  inline void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
+

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

-  virtual wxMenuBar *GetMenuBar();
+  virtual wxMenuBar *GetMenuBar() const;

 
   virtual void SetTitle( const wxString &title );
   virtual wxString GetTitle() const { return m_title; }
 
   virtual void SetTitle( const wxString &title );
   virtual wxString GetTitle() const { return m_title; }

-  
+

   virtual void SetIcon( const wxIcon &icon );
   virtual void SetIcon( const wxIcon &icon );

+  virtual void Iconize( bool WXUNUSED(iconize)) { }
+  virtual bool IsIconized() const { return FALSE; }
+  bool Iconized() const { return IsIconized(); }
+  virtual void Maximize(bool WXUNUSED(maximize)) {}
+  virtual void Restore() {}

 
 

+  void OnCloseWindow( wxCloseEvent& event );

   void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
   void OnSize( wxSizeEvent &event );
   void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
   void OnSize( wxSizeEvent &event );

-  void OnCloseWindow( wxCloseEvent& event );
-  void OnIdle(wxIdleEvent& event);

 
 

-  virtual void AddChild( wxWindow *child );
-  virtual void GtkOnSize( int x, int y, int width, int height );
+  void OnMenuHighlight( wxMenuEvent& event );

 
 

-private:
-  friend  wxWindow;
-  friend  wxMDIChildFrame;
-  friend  wxMDIClientWindow;
+  // implementation

 
 

-  // update frame's menus (called from OnIdle)
+  virtual void GtkOnSize( int x, int y, int width, int height );
+  virtual wxPoint GetClientAreaOrigin() const;

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

+  virtual void OnInternalIdle();

 
 

-  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;

+  int           m_miniEdge,m_miniTitle;

 
   DECLARE_EVENT_TABLE()
 };
 
   DECLARE_EVENT_TABLE()
 };