Mods for Wine compilation

[wxWidgets.git] / src / generic / spinctlg.cpp

diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp
index b8c1f48b40af26e9f1a27154b42c491fad174a7b..548025594a684e8f20fbea221717d313fc568e21 100644 (file)
--- a/src/generic/spinctlg.cpp
+++ b/src/generic/spinctlg.cpp
@@ -28,8 +28,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if !(defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__)) || defined(__WXMAC__) || \
-    defined(__WXUNIVERSAL__)
+#if !(defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__)) || \
+    defined(__WXMAC__) || defined(__WXUNIVERSAL__)

 
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"


@@ -109,7 +109,7 @@ public:
 protected:
     void OnSpinButton(wxSpinEvent& eventSpin)
     {
 protected:
     void OnSpinButton(wxSpinEvent& eventSpin)
     {

-#ifdef __WXMAC__
+#if defined(__WXMAC__) || defined(__WXMOTIF__)

       m_spin->SetTextValue(eventSpin.GetPosition());
 
       wxCommandEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, m_spin->GetId());
       m_spin->SetTextValue(eventSpin.GetPosition());
 
       wxCommandEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, m_spin->GetId());


@@ -134,7 +134,7 @@ BEGIN_EVENT_TABLE(wxSpinCtrlButton, wxSpinButton)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)

-
+    

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -190,7 +190,10 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     }
     DoSetSize(pos.x, pos.y, csize.x, csize.y);
 #else
     }
     DoSetSize(pos.x, pos.y, csize.x, csize.y);
 #else

-    DoSetSize(pos.x, pos.y, size.x, size.y);
+    wxSize best = GetBestSize();
+    if ( size.x != -1 ) best.x = size.x;
+    if ( size.y != -1 ) best.y = size.y;
+    DoSetSize(pos.x, pos.y, best.x, best.y);

 #endif
     // have to disable this window to avoid interfering it with message
     // processing to the text and the button... but pretend it is enabled to
 #endif
     // have to disable this window to avoid interfering it with message
     // processing to the text and the button... but pretend it is enabled to


@@ -220,7 +223,7 @@ wxSpinCtrl::~wxSpinCtrl()
 // geometry
 // ----------------------------------------------------------------------------
 
 // geometry
 // ----------------------------------------------------------------------------
 

-wxSize wxSpinCtrl::DoGetBestClientSize() const
+wxSize wxSpinCtrl::DoGetBestSize() const

 {
     wxSize sizeBtn = m_btn->GetBestSize(),
            sizeText = m_text->GetBestSize();
 {
     wxSize sizeBtn = m_btn->GetBestSize(),
            sizeText = m_text->GetBestSize();


@@ -232,18 +235,15 @@ void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
 {
     wxControl::DoMoveWindow(x, y, width, height);
 
 {
     wxControl::DoMoveWindow(x, y, width, height);
 

-    wxPoint p = GetParent() ? 
-                GetParent()->GetClientAreaOrigin() : wxPoint(0,0);
-

     // position the subcontrols inside the client area
     wxSize sizeBtn = m_btn->GetSize();
 
     wxCoord wText = width - sizeBtn.x;
     // position the subcontrols inside the client area
     wxSize sizeBtn = m_btn->GetSize();
 
     wxCoord wText = width - sizeBtn.x;

-    m_text->SetSize(x-p.x, y-p.y, wText, height);
+    m_text->SetSize(x, y, wText, height);

 #ifdef __WXMAC__
 #ifdef __WXMAC__

-    m_btn->SetSize(x-p.x + wText + MARGIN, y-p.y, -1, -1);
+    m_btn->SetSize(x + wText + MARGIN, y, -1, -1);

 #else
 #else

-    m_btn->SetSize(x-p.x + wText + MARGIN, y-p.y, -1, height);
+    m_btn->SetSize(x + wText + MARGIN, y, -1, height);

 #endif
 }
 
 #endif
 }
 


@@ -331,7 +331,7 @@ void wxSpinCtrl::SetTextValue(int val)
     m_text->SetSelection(0, -1);
 
     // and give focus to the control!
     m_text->SetSelection(0, -1);
 
     // and give focus to the control!

-    m_text->SetFocus();
+    // m_text->SetFocus();    Why???? TODO.

 }
 
 void wxSpinCtrl::SetValue(int val)
 }
 
 void wxSpinCtrl::SetValue(int val)