OS/2 update for wxUniv merge.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-06 21:45:11 +00:00
parent cf1dfa6b8f
commit 210a651b4f
25 changed files with 149 additions and 174 deletions
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -69,6 +69,10 @@ protected:
    // the margins around the bitmap
    int m_marginX,
        m_marginY;
+private:
+    // Prevent Virtual function hiding warnings
+    void SetLabel(const wxString& rsLabel)
+    { wxWindowBase::SetLabel(rsLabel); }
 };

 #if defined(__WXUNIVERSAL__)