X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..9a7b7798282622e445efc3318b6c85ff0bed9af8:/src/generic/spinctlg.cpp?ds=inline diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp index 488f789a1e..88de174cfd 100644 --- a/src/generic/spinctlg.cpp +++ b/src/generic/spinctlg.cpp @@ -6,7 +6,7 @@ // Created: 29.01.01 // RCS-ID: $Id$ // Copyright: (c) 2001 Vadim Zeitlin -// License: wxWidgets licence +// License: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "spinctlg.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -60,9 +56,9 @@ public: : wxTextCtrl(spin->GetParent(), wxID_ANY, value) { m_spin = spin; - + // remove the default minsize, the spinctrl will have one instead - SetSizeHints(wxDefaultSize.x,wxDefaultSize.y); + SetSizeHints(wxDefaultCoord,wxDefaultCoord); } protected: @@ -111,7 +107,7 @@ public: SetWindowStyle(style | wxSP_VERTICAL); // remove the default minsize, the spinctrl will have one instead - SetSizeHints(wxDefaultSize.x,wxDefaultSize.y); + SetSizeHints(wxDefaultCoord,wxDefaultCoord); } protected: @@ -157,7 +153,7 @@ void wxSpinCtrl::Init() bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id, const wxString& value, - const wxPoint& WXUNUSED(pos), + const wxPoint& pos, const wxSize& size, long style, int min, @@ -184,11 +180,12 @@ bool wxSpinCtrl::Create(wxWindow *parent, m_text = new wxSpinCtrlText(this, value); m_btn = new wxSpinCtrlButton(this, style); - + m_btn->SetRange(min, max); m_btn->SetValue(initial); - SetBestSize(size); - + SetInitialSize(size); + Move(pos); + // have to disable this window to avoid interfering it with message // processing to the text and the button... but pretend it is enabled to // make IsEnabled() return true @@ -234,7 +231,7 @@ void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height) wxCoord wText = width - sizeBtn.x; m_text->SetSize(x, y, wText, height); - m_btn->SetSize(x + wText + MARGIN, y, wxDefaultSize.x, height); + m_btn->SetSize(x + wText + MARGIN, y, wxDefaultCoord, height); } // ----------------------------------------------------------------------------