Made GetLabel/SetLabel() virtual

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

diff --git a/include/wx/window.h b/include/wx/window.h
index 8aa851a82a674abfbb9f5c0afd9f606b8905106a..6b2d7aa57850da1c8f1359f8b21164a62385500c 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -156,8 +156,8 @@ public:
 
         // label is just the same as the title (but for, e.g., buttons it
         // makes more sense to speak about labels)
-    void SetLabel(const wxString& label) { SetTitle(label); }
-    wxString GetLabel() const { return GetTitle(); }
+    virtual void SetLabel(const wxString& label) { SetTitle(label); }
+    virtual wxString GetLabel() const { return GetTitle(); }
 
         // the window name is used for ressource setting in X, it is not the
         // same as the window title/label

diff --git a/samples/scroll/scroll.cpp b/samples/scroll/scroll.cpp
index ece802323fbcccc0f0ab39ad8eb3d0cfc77e23aa..901197db71ef49ae496d4744eab80160091a6c4f 100644 (file)
--- a/samples/scroll/scroll.cpp
+++ b/samples/scroll/scroll.cpp
@@ -88,13 +88,13 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
         "examples."
     };
   
-//  (void) new wxButton( this, -1, "wxButton", wxPoint(10,10) );
+  (void) new wxButton( this, -1, "wxButton", wxPoint(10,10) );
   
-//  (void) new wxTextCtrl( this, -1, "wxTextCtrl", wxPoint(10,50) );
+  (void) new wxTextCtrl( this, -1, "wxTextCtrl", wxPoint(10,50) );
   
   (void) new wxRadioButton( this, -1, "Disable", wxPoint(10,90) );
   
-//  (void) new wxComboBox( this, -1, "This", wxPoint(10,130), wxDefaultSize, 5, choices );
+  (void) new wxComboBox( this, -1, "This", wxPoint(10,130), wxDefaultSize, 5, choices );
   
   (void) new wxRadioBox( this, -1, "This", wxPoint(10,200), wxDefaultSize, 5, choices );