make wxChoice and wxListBox inherit from wxControlWithItems and not wxControl for...

[wxWidgets.git] / src / mac / carbon / spinctrl.cpp

diff --git a/src/mac/carbon/spinctrl.cpp b/src/mac/carbon/spinctrl.cpp
index 3db287f0a86e675182f28f85876f6087fe3c66bc..e0e3bcb59780f510ac6115529c9f1da24b9bd0db 100644 (file)
--- a/src/mac/carbon/spinctrl.cpp
+++ b/src/mac/carbon/spinctrl.cpp
@@ -44,7 +44,7 @@ public:
         m_spin = spin;
 
         // remove the default minsize, the spinctrl will have one instead
         m_spin = spin;
 
         // remove the default minsize, the spinctrl will have one instead

-        SetSizeHints(-1,-1);
+        SetMinSize(wxDefaultSize);

     }
 
     bool ProcessEvent(wxEvent &event)
     }
 
     bool ProcessEvent(wxEvent &event)


@@ -153,7 +153,7 @@ public:
         //SetWindowVariant(wxWINDOW_VARIANT_SMALL);
 
         // remove the default minsize, the spinctrl will have one instead
         //SetWindowVariant(wxWINDOW_VARIANT_SMALL);
 
         // remove the default minsize, the spinctrl will have one instead

-        SetSizeHints(-1,-1);
+        SetMinSize(wxDefaultSize);

     }
 
 protected:
     }
 
 protected:


@@ -202,7 +202,7 @@ void wxSpinCtrl::Init()
 {
     m_text = NULL;
     m_btn = NULL;
 {
     m_text = NULL;
     m_btn = NULL;

-    m_container.SetContainerWindow(this);
+    WX_INIT_CONTROL_CONTAINER();

 }
 
 bool wxSpinCtrl::Create(wxWindow *parent,
 }
 
 bool wxSpinCtrl::Create(wxWindow *parent,


@@ -256,7 +256,7 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     //SetSize(csize);
 
     //MacPostControlCreate(pos, csize);
     //SetSize(csize);
 
     //MacPostControlCreate(pos, csize);

-    SetInitialBestSize(csize);
+    SetInitialSize(csize);

 
     return true;
 }
 
     return true;
 }