OS/2 version was using ~ instead of * for a termination character so

[wxWidgets.git] / src / stubs / control.cpp

diff --git a/src/stubs/control.cpp b/src/stubs/control.cpp
index 651b272953bcb846674bff1b6d9e7d92edbdcff8..6ce584b2eaa1c4ad8fa647792340607bdbb74904 100644 (file)
--- a/src/stubs/control.cpp
+++ b/src/stubs/control.cpp
@@ -15,12 +15,10 @@
 
 #include "wx/control.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 BEGIN_EVENT_TABLE(wxControl, wxWindow)
 END_EVENT_TABLE()
-#endif
 
 // Item members
 wxControl::wxControl()
@@ -37,7 +35,7 @@ wxControl::~wxControl()
     wxWindow *parent = (wxWindow *)GetParent();
     if (parent)
     {
-        if (parent->GetDefaultItem() == this)
+        if (parent->GetDefaultItem() == (wxButton*) this)
             parent->SetDefaultItem(NULL);
     }
 }
@@ -53,17 +51,6 @@ wxString wxControl::GetLabel() const
     return wxString("");
 }
 
-/*
- * Allocates control IDs within the appropriate range
- */
-
-int NewControlId()
-{
-    static int s_controlId = 0;
-    s_controlId ++;
-    return s_controlId;
-}
-
 void wxControl::ProcessCommand (wxCommandEvent & event)
 {
   // Tries:
@@ -80,11 +67,6 @@ void wxControl::ProcessCommand (wxCommandEvent & event)
     }
 }
 
-void wxControl::SetClientSize (int width, int height)
-{
-  SetSize (-1, -1, width, height);
-}
-
 void wxControl::Centre (int direction)
 {
   int x, y, width, height, panel_width, panel_height, new_x, new_y;