Cleaned up paint DC cache in ~wxPaintDC to avoid spurious memory warning

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

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index b69144382b3b106930b538ce9786cd40cee38bbe..506ee744c2e70f8a0ab3e8d1c68889b9be6a8ff2 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -60,11 +60,11 @@ public:
     bool Destroy();
 
     virtual bool Show( bool show );
     bool Destroy();
 
     virtual bool Show( bool show );

-    virtual void Centre( int direction = wxHORIZONTAL );
+    virtual void Centre( int direction = wxBOTH );

 
 #if wxUSE_STATUSBAR
     virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
 
 #if wxUSE_STATUSBAR
     virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,

-            const wxString& name = _T("statusBar"));
+            const wxString& name = wxT("statusBar"));

     virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id,
             const wxString& name );
     virtual wxStatusBar *GetStatusBar() const;
     virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id,
             const wxString& name );
     virtual wxStatusBar *GetStatusBar() const;


@@ -78,7 +78,7 @@ public:
             const wxString& name = wxToolBarNameStr);
     virtual wxToolBar *OnCreateToolBar( long style, wxWindowID id, const wxString& name );
     virtual wxToolBar *GetToolBar() const;
             const wxString& name = wxToolBarNameStr);
     virtual wxToolBar *OnCreateToolBar( long style, wxWindowID id, const wxString& name );
     virtual wxToolBar *GetToolBar() const;

-    void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
+    void SetToolBar(wxToolBar *toolbar);

 #endif // wxUSE_TOOLBAR
 
     virtual void SetMenuBar( wxMenuBar *menuBar );
 #endif // wxUSE_TOOLBAR
 
     virtual void SetMenuBar( wxMenuBar *menuBar );


@@ -91,17 +91,18 @@ public:
     virtual void MakeModal(bool modal = TRUE);
 
     virtual void SetIcon( const wxIcon &icon );
     virtual void MakeModal(bool modal = TRUE);
 
     virtual void SetIcon( const wxIcon &icon );

-    virtual void Iconize( bool WXUNUSED(iconize)) { }
-    virtual bool IsIconized() const { return FALSE; }

     bool Iconized() const { return IsIconized(); }
     bool Iconized() const { return IsIconized(); }

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

 
     virtual void Command( int id );
     
     void OnCloseWindow( wxCloseEvent& event );
     void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
     void OnSize( wxSizeEvent &event );
 
     virtual void Command( int id );
     
     void OnCloseWindow( wxCloseEvent& event );
     void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
     void OnSize( wxSizeEvent &event );

+    void OnIdle( wxIdleEvent &event );

 
     void OnMenuHighlight( wxMenuEvent& event );
 
 
     void OnMenuHighlight( wxMenuEvent& event );