added AppendText method, now used by operator <<

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

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index 4e02f0632430b7f2ebe523ba6d4bd65a7824e4cc..0dd712f94631529847e3895586560f76cc2b8713 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -83,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* 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 );
   inline void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
 
   virtual void SetMenuBar( wxMenuBar *menuBar );


@@ -94,15 +94,14 @@ public:
 
   virtual void SetIcon( const wxIcon &icon );
   virtual void Iconize( bool WXUNUSED(iconize)) { }
 
   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 Maximize(bool WXUNUSED(maximize)) {}

-  virtual void Restore(void) {}
+  virtual void Restore() {}

 
   void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
   void OnSize( wxSizeEvent &event );
   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 );

 
   // implementation
   
 
   // implementation
   


@@ -110,6 +109,7 @@ public:
   virtual wxPoint GetClientAreaOrigin() const;
   void DoMenuUpdates();
   void DoMenuUpdates(wxMenu* menu);
   virtual wxPoint GetClientAreaOrigin() const;
   void DoMenuUpdates();
   void DoMenuUpdates(wxMenu* menu);

+  virtual void OnInternalIdle();

 
   wxMenuBar    *m_frameMenuBar;
   wxStatusBar  *m_frameStatusBar;
 
   wxMenuBar    *m_frameMenuBar;
   wxStatusBar  *m_frameStatusBar;