commdlg.lib is not in evc3

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

diff --git a/include/wx/window.h b/include/wx/window.h
index b2e14d4151d90bca968e6062e07f7c80d4b73bf3..bdf6b7cab6aebb556254712ca0c9e731c8f120bf 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -439,6 +439,10 @@ public:
         // make the window modal (all other windows unresponsive)
     virtual void MakeModal(bool modal = true);
 
+
+    // (primitive) theming support
+    // ---------------------------
+
     virtual void SetThemeEnabled(bool enableTheme) { m_themeEnabled = enableTheme; }
     virtual bool GetThemeEnabled() const { return m_themeEnabled; }
 
@@ -450,10 +454,6 @@ public:
     virtual void ApplyParentThemeBackground(const wxColour& WXUNUSED(bg))
         { /* do nothing */ }
     
-        // returns true if this window should inherit its parent colours on
-        // creation
-    virtual bool ShouldInheritColours() const { return false; }
-
 
     // focus and keyboard handling
     // ---------------------------
@@ -697,25 +697,42 @@ public:
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
         // set/retrieve the window colours (system defaults are used by
-        // default): Set functions return true if colour was changed
-    virtual bool SetBackgroundColour( const wxColour &colour );
-    virtual bool SetForegroundColour( const wxColour &colour );
-
+        // default): SetXXX() functions return true if colour was changed,
+        // SetDefaultXXX() reset the "m_hasXXX" flag after setting the value
+        // to prevent it from being inherited by our children
+    virtual bool SetBackgroundColour(const wxColour& colour);
+    void SetDefaultBackgroundColour(const wxColour& colour)
+    {
+        if ( SetBackgroundColour(colour) )
+            m_hasBgCol = false;
+    }
     wxColour GetBackgroundColour() const;
+
+    virtual bool SetForegroundColour(const wxColour& colour);
+    void SetDefaultForegroundColour(const wxColour& colour)
+    {
+        if ( SetForegroundColour(colour) )
+            m_hasFgCol = false;
+    }
     wxColour GetForegroundColour() const;
 
+        // set/retrieve the font for the window (SetFont() returns true if the
+        // font really changed)
+    virtual bool SetFont(const wxFont& font) = 0;
+    void SetDefaultFont(const wxFont& font)
+    {
+        if ( SetFont(font) )
+            m_hasFont = false;
+    }
+    const wxFont& GetFont() const { return DoGetFont(); }
+    wxFont& GetFont() { return DoGetFont(); }
+
         // set/retrieve the cursor for this window (SetCursor() returns true
         // if the cursor was really changed)
     virtual bool SetCursor( const wxCursor &cursor );
     const wxCursor& GetCursor() const { return m_cursor; }
     wxCursor& GetCursor() { return m_cursor; }
 
-        // set/retrieve the font for the window (SetFont() returns true if the
-        // font really changed)
-    virtual bool SetFont( const wxFont &font ) = 0;
-    const wxFont& GetFont() const { return DoGetFont(); }
-    wxFont& GetFont() { return DoGetFont(); }
-
 #if wxUSE_CARET
         // associate a caret with the window
     void SetCaret(wxCaret *caret);
@@ -914,17 +931,7 @@ public:
     wxSizer *GetSizer() const { return m_windowSizer; }
 
     // Track if this window is a member of a sizer
-    void SetContainingSizer(wxSizer* sizer)
-    {
-        // adding a window to a sizer twice is going to result in fatal and
-        // hard to debug problems later because when deleting the second
-        // associated wxSizerItem we're going to dereference a dangling
-        // pointer; so try to detect this as early as possible
-        wxASSERT_MSG( !sizer || m_containingSizer != sizer,
-                        _T("Adding a window to the same sizer twice?") );
-
-        m_containingSizer = sizer;
-    }
+    void SetContainingSizer(wxSizer* sizer);
     wxSizer *GetContainingSizer() const { return m_containingSizer; }
 
     // accessibility
@@ -987,6 +994,18 @@ protected:
     virtual bool TryValidator(wxEvent& event);
     virtual bool TryParent(wxEvent& event);
 
+    // inherit the parents visual attributes if they had been explicitly set
+    // by the user (i.e. we don't inherit default attributes) and if we don't
+    // have our own explicitly set
+    virtual void InheritAttributes();
+
+    // returns false from here if this window doesn't want to inherit the
+    // parents colours even if InheritAttributes() would normally do it
+    //
+    // this just provides a simple way to customize InheritAttributes()
+    // behaviour in the most common case
+    virtual bool ShouldInheritColours() const { return false; }
+
 
 #if wxUSE_CONSTRAINTS
     // satisfy the constraints for the windows but don't set the window sizes
@@ -1091,9 +1110,10 @@ protected:
 #if wxUSE_ACCESSIBILITY
     wxAccessible*       m_accessible;
 #endif
-    // Best size for controls which fail to implement DoGetBestSize()
-    wxSize              m_bestSize;
 
+    // Initial window size, used as minimal size in Sizers
+    wxSize              m_initialSize;
+    
     // Virtual size (scrolling)
     wxSize                m_virtualSize;