wxID_PREFERENCES added for the preferences menu item

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

diff --git a/include/wx/window.h b/include/wx/window.h
index e8767aae8cf2b5eef70b86f87e0c3a52bccd4c08..0917bae9443d400ce3316469ea759eb6bc0104da 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -434,6 +434,9 @@ public:
     const wxWindowList& GetChildren() const { return m_children; }
     wxWindowList& GetChildren() { return m_children; }
 
     const wxWindowList& GetChildren() const { return m_children; }
     wxWindowList& GetChildren() { return m_children; }
 

+    // needed just for extended runtime
+    const wxWindowList& GetWindowChildren() const { return GetChildren() ; }
+

         // get the parent or the parent of the parent
     wxWindow *GetParent() const { return m_parent; }
     inline wxWindow *GetGrandParent() const;
         // get the parent or the parent of the parent
     wxWindow *GetParent() const { return m_parent; }
     inline wxWindow *GetGrandParent() const;


@@ -583,8 +586,8 @@ public:
         // repaint all invalid areas of the window immediately
     virtual void Update() { }
 
         // repaint all invalid areas of the window immediately
     virtual void Update() { }
 

-        // clear the window entirely
-    virtual void Clear() = 0;
+        // clear the window background
+    virtual void ClearBackground();

 
         // freeze the window: don't redraw it until it is thawed
     virtual void Freeze() { }
 
         // freeze the window: don't redraw it until it is thawed
     virtual void Freeze() { }


@@ -775,6 +778,7 @@ public:
     void SetToolTip( wxToolTip *tip ) { DoSetToolTip(tip); }
         // get the associated tooltip or NULL if none
     wxToolTip* GetToolTip() const { return m_tooltip; }
     void SetToolTip( wxToolTip *tip ) { DoSetToolTip(tip); }
         // get the associated tooltip or NULL if none
     wxToolTip* GetToolTip() const { return m_tooltip; }

+       wxString GetToolTipText() const ;

 #endif // wxUSE_TOOLTIPS
 
     // drag and drop
 #endif // wxUSE_TOOLTIPS
 
     // drag and drop


@@ -862,17 +866,6 @@ public:
     wxAccessible* GetOrCreateAccessible() ;
 #endif
 
     wxAccessible* GetOrCreateAccessible() ;
 #endif
 

-    // backward compatibility
-    // ----------------------
-#if WXWIN_COMPATIBILITY
-    bool Enabled() const { return IsEnabled(); }
-
-    void SetButtonFont(const wxFont& font) { SetFont(font); }
-    void SetLabelFont(const wxFont& font) { SetFont(font); }
-    wxFont& GetLabelFont() { return GetFont(); };
-    wxFont& GetButtonFont() { return GetFont(); };
-#endif // WXWIN_COMPATIBILITY
-

     // implementation
     // --------------
 
     // implementation
     // --------------
 


@@ -914,9 +907,7 @@ public:
 
 protected:
     // event handling specific to wxWindow
 
 protected:
     // event handling specific to wxWindow

-#if wxUSE_VALIDATORS

     virtual bool TryValidator(wxEvent& event);
     virtual bool TryValidator(wxEvent& event);

-#endif // wxUSE_VALIDATORS

     virtual bool TryParent(wxEvent& event);
 
 
     virtual bool TryParent(wxEvent& event);