Implemented PocketPC menubar/toolbar as wxToolMenuBar derived

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

diff --git a/include/wx/window.h b/include/wx/window.h
index ed8bfdd743f8f0ddedbc93d4f570ad665a26e330..06b9ad44d464664cad1b5a0223ea99acc2d4ab28 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -424,16 +424,10 @@ public:
 
         // Override these methods for windows that have a virtual size
         // independent of their client size.  eg. the virtual area of a
 
         // Override these methods for windows that have a virtual size
         // independent of their client size.  eg. the virtual area of a

-        // wxScrolledWindow.  Default is to return m_virtualSize unless
-        // the client size is bigger.
+        // wxScrolledWindow.

 
     virtual void DoSetVirtualSize( int x, int y );
     virtual wxSize DoGetVirtualSize() const;
 
     virtual void DoSetVirtualSize( int x, int y );
     virtual wxSize DoGetVirtualSize() const;

-    
-    
-        // Really return just m_virtualSize, nothing else
-    
-    wxSize GetPureVirtualSize() const { return m_virtualSize; }

 
         // Return the largest of ClientSize and BestSize (as determined
         // by a sizer, interior children, or other means)
 
         // Return the largest of ClientSize and BestSize (as determined
         // by a sizer, interior children, or other means)


@@ -765,6 +759,14 @@ public:
             m_inheritBgCol = false;
     }
     wxColour GetBackgroundColour() const;
             m_inheritBgCol = false;
     }
     wxColour GetBackgroundColour() const;

+    bool InheritsBackgroundColour() const
+    {
+        return m_inheritBgCol;
+    }
+    bool UseBgCol() const
+    {
+        return m_hasBgCol;
+    }

 
     // if the window shouldn't inherit its colour from the parent, override
     // this function to return true
 
     // if the window shouldn't inherit its colour from the parent, override
     // this function to return true