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 c87f59f47ceeb42d6b9dfc3c987c6dd4bccef537..829a83fc5f1ed87f22bf0844042de978bdf1901a 100644 (file)
--- a/include/wx/gtk1/frame.h
+++ b/include/wx/gtk1/frame.h
@@ -18,6 +18,7 @@
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/window.h"
+#include "wx/icon.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -62,12 +63,14 @@ public:
   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); }
+
   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,
@@ -80,7 +83,7 @@ public:
   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;
+  virtual wxToolBar *GetToolBar() const;
   inline void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
 
   virtual void SetMenuBar( wxMenuBar *menuBar );
@@ -91,28 +94,31 @@ public:
 
   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 bool IsIconized() const { return FALSE; }
+  bool Iconized() const { return IsIconized(); }
   virtual void Maximize(bool WXUNUSED(maximize)) {}
-  virtual void Restore(void) {}
+  virtual void Restore() {}
 
+  void OnCloseWindow( wxCloseEvent& event );
   void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
   void OnSize( wxSizeEvent &event );
-  void OnCloseWindow( wxCloseEvent& event );
-  void OnIdle(wxIdleEvent& event);
+
+  void OnMenuHighlight( wxMenuEvent& event );
 
   // implementation
-  
+
   virtual void GtkOnSize( int x, int y, int width, int height );
   virtual wxPoint GetClientAreaOrigin() const;
   void DoMenuUpdates();
   void DoMenuUpdates(wxMenu* menu);
+  virtual void OnInternalIdle();
 
   wxMenuBar    *m_frameMenuBar;
   wxStatusBar  *m_frameStatusBar;
   wxToolBar    *m_frameToolBar;
   wxString      m_title;
   wxIcon        m_icon;
+  int           m_miniEdge,m_miniTitle;
 
   DECLARE_EVENT_TABLE()
 };