moved all code concerning toplevel code from the window file to toplevel

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

diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index ba2828e06f36f07a0b2eedcf197fcb7a8f41f767..cfe3c89bb7e729cbed19fee165db2e2ffe8248bb 100644 (file)
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@@ -7,7 +7,7 @@
 // Modified by:
 // Created:     06.08.00
 // RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -61,12 +61,14 @@ enum
 #define wxWindowNative wxWindowGTK
 #elif defined(__WXMGL__)
 #define wxWindowNative wxWindowMGL
+#elif defined(__WXMAC__)
+#define wxWindowNative wxWindowMac
 #endif
 
 class WXDLLEXPORT wxWindow : public wxWindowNative
 {
 public:
-    // ctors and creatie functions
+    // ctors and create functions
     // ---------------------------
 
     wxWindow() { Init(); }
@@ -198,11 +200,6 @@ public:
     // we refresh the window when it is dis/enabled
     virtual bool Enable(bool enable = TRUE);
 
-    // remember that the font/colour was changed
-    virtual bool SetBackgroundColour(const wxColour& colour);
-    virtual bool SetForegroundColour(const wxColour& colour);
-    virtual bool SetFont(const wxFont& font);
-
     // our Capture/ReleaseMouse() maintains the stack of windows which had
     // captured the mouse and when ReleaseMouse() is called, the mouse freed
     // only if the stack is empty, otherwise it is captured back by the window
@@ -270,11 +267,8 @@ protected:
     int       m_alignBgBitmap;
     wxStretch m_stretchBgBitmap;
 
-    // more flags
-    bool m_isCurrent:1; // is the mouse currently inside the window?
-    bool m_hasBgCol:1;  // was the bg colour explicitly changed by user?
-    bool m_hasFgCol:1;  //         fg
-    bool m_hasFont:1;   //         font
+    // is the mouse currently inside the window?
+    bool m_isCurrent:1;
 
 private:
     // the window scrollbars