Do not declare "environ" variable ourselves under MSW.

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

diff --git a/src/generic/timectrl.cpp b/src/generic/timectrl.cpp
index 38218a6a62b99241031eb00ad2a6d340898e1db5..b3d0e5acafb79edc5f34e860a841547f50309323 100644 (file)
--- a/src/generic/timectrl.cpp
+++ b/src/generic/timectrl.cpp
@@ -72,7 +72,9 @@ public:
         // this is not currently supported by wxTextCtrl.
         m_text->SetCursor(wxCURSOR_ARROW);
 
-        m_btn = new wxSpinButton(ctrl);
+        m_btn = new wxSpinButton(ctrl, wxID_ANY,
+                                 wxDefaultPosition, wxDefaultSize,
+                                 wxSP_VERTICAL | wxSP_WRAP);
 
         m_currentField = Field_Hour;
         m_isFirstDigit = true;
@@ -298,24 +300,16 @@ private:
         }
 
         ChangeCurrentField(field);
-
-        // As we don't skip the event, we also prevent the system from setting
-        // focus to this control as it does by default, so do it manually.
-        m_text->SetFocus();
     }
 
     void OnArrowUp(wxSpinEvent& WXUNUSED(event))
     {
         ChangeCurrentFieldBy1(Dir_Up);
-
-        m_text->SetFocus();
     }
 
     void OnArrowDown(wxSpinEvent& WXUNUSED(event))
     {
         ChangeCurrentFieldBy1(Dir_Down);
-
-        m_text->SetFocus();
     }
 
 
@@ -374,6 +368,8 @@ private:
     // Select the currently actively field.
     void HighlightCurrentField()
     {
+        m_text->SetFocus();
+
         const CharRange range = GetFieldRange(m_currentField);
 
         m_text->SetSelection(range.from, range.to);