reset fg/bg colour and font to default if set to wxNullColour/Font

[wxWidgets.git] / include / wx / window.h

diff --git a/include/wx/window.h b/include/wx/window.h
index 3370fa75b28c033050202d985b64a053ddc29ca7..87dc4cc69168862d6514fea2cfbcd6869ba9c412 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -366,6 +366,9 @@ public:
     virtual wxSize GetMaxSize() const { return wxSize( m_maxWidth, m_maxHeight ); }
     virtual wxSize GetMinSize() const { return wxSize( m_minWidth, m_minHeight ); }
 
     virtual wxSize GetMaxSize() const { return wxSize( m_maxWidth, m_maxHeight ); }
     virtual wxSize GetMinSize() const { return wxSize( m_minWidth, m_minHeight ); }
 

+    void SetMinSize(const wxSize& minSize) { SetSizeHints(minSize); }
+    void SetMaxSize(const wxSize& maxSize) { SetSizeHints(GetMinSize(), maxSize); }
+    

         // Methods for accessing the virtual size of a window.  For most
         // windows this is just the client area of the window, but for
         // some like scrolled windows it is more or less independent of
         // Methods for accessing the virtual size of a window.  For most
         // windows this is just the client area of the window, but for
         // some like scrolled windows it is more or less independent of


@@ -490,7 +493,7 @@ public:
     virtual void SetTmpDefaultItem(wxWindow * WXUNUSED(win)) { }
 
         // Navigates in the specified direction by sending a wxNavigationKeyEvent
     virtual void SetTmpDefaultItem(wxWindow * WXUNUSED(win)) { }
 
         // Navigates in the specified direction by sending a wxNavigationKeyEvent

-    virtual bool Navigate(bool direction = true, bool windowChange = false);
+    virtual bool Navigate(int flags = wxNavigationKeyEvent::IsForward);

 
     // parent/children relations
     // -------------------------
 
     // parent/children relations
     // -------------------------