ifacecheck fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/interface/wx/font.h b/interface/wx/font.h
index 3a405db322c9d6a8a5e35e9254f949935c982bd4..3ffd7e94c308b49050bb50290377101d06d6c975 100644 (file)
--- a/interface/wx/font.h
+++ b/interface/wx/font.h
@@ -401,7 +401,7 @@ public:
 
         @see SetFamily()
     */
-    wxFontFamily GetFamily() const;
+    virtual wxFontFamily GetFamily() const;
 
     /**
         Returns the platform-dependent string completely describing this font.
@@ -437,7 +437,7 @@ public:
 
         @see SetStyle()
     */
-    wxFontStyle GetStyle() const;
+    virtual wxFontStyle GetStyle() const;
 
     /**
         Returns @true if the font is underlined, @false otherwise.
@@ -451,7 +451,7 @@ public:
 
         @see SetWeight()
     */
-    wxFontWeight GetWeight() const;
+    virtual wxFontWeight GetWeight() const;
 
     /**
         Returns @true if the font is a fixed width (or monospaced) font,
@@ -596,7 +596,7 @@ public:
 
         @see GetUnderlined()
     */
-    void SetUnderlined(const bool underlined);
+    virtual void SetUnderlined(bool underlined);
 
     /**
         Sets the font weight.

diff --git a/interface/wx/html/winpars.h b/interface/wx/html/winpars.h
index 2dd656263131b293ad09b1f903e4b5e4c0426c85..10bb39060f06a7a6d7bbd469497d9f515f778c8d 100644 (file)
--- a/interface/wx/html/winpars.h
+++ b/interface/wx/html/winpars.h
@@ -214,6 +214,7 @@ public:
         (You should always test if it is non-@NULL.
         For example @c TITLE handler sets window title only if some window is
         associated, otherwise it does nothing.
+        @deprecated use GetWindowInterface()->GetHTMLWindow() instead
     */
     wxHtmlWindow* GetWindow();
 

diff --git a/interface/wx/mdi.h b/interface/wx/mdi.h
index dbb43f994baa7dd8d4ff9032e9588afd7b713329..0729f366f5e0d2bf090ba5cac62e75885daa53cd 100644 (file)
--- a/interface/wx/mdi.h
+++ b/interface/wx/mdi.h
@@ -234,14 +234,14 @@ public:
         If there are any children at all this function returns a non-@NULL
         pointer.
     */
-    wxMDIChildFrame* GetActiveChild() const;
+    virtual wxMDIChildFrame* GetActiveChild() const;
 
     /**
         Returns a pointer to the client window.
 
         @see OnCreateClient()
     */
-    wxWindow *GetClientWindow() const;
+    wxMDIClientWindowBase* GetClientWindow() const;
 
     /**
         Returns the current MDI Window menu.
@@ -315,7 +315,7 @@ public:
         @param menu
             The menu to be used instead of the standard MDI Window menu or @NULL.
     */
-    void SetWindowMenu(wxMenu *menu);
+    virtual void SetWindowMenu(wxMenu* menu);
 
     /**
         Tiles the MDI child windows either horizontally or vertically depending

diff --git a/interface/wx/stream.h b/interface/wx/stream.h
index b2a8c9cb9028adeefc68750db07d746e3d7aa651..88d260410367dd021534edc6b44338db1cf44aad 100644 (file)
--- a/interface/wx/stream.h
+++ b/interface/wx/stream.h
@@ -353,6 +353,7 @@ public:
 
     /**
         Returns the parent stream of the stream buffer.
+        @deprecated use GetStream() instead
     */
     wxStreamBase* Stream();