dmars_smake support (bakefile cvs, patch 942877)

[wxWidgets.git] / src / gtk1 / spinctrl.cpp

diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp
index 2fbffa6771a82d5cbb49a563aca6316bb634104c..a15f637dda564761191a956cf7112403f2c451f8 100644 (file)
--- a/src/gtk1/spinctrl.cpp
+++ b/src/gtk1/spinctrl.cpp
@@ -8,10 +8,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "spinctrl.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/spinctrl.h"
 
 #if wxUSE_SPINCTRL
@@ -124,9 +127,8 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
     m_parent->DoAddChild( this );
 
     PostCreation();
+    InheritAttributes();
 
-    SetFont( parent->GetFont() );
-    
     wxSize size_best( DoGetBestSize() );
     wxSize new_size( size );
     if (new_size.x == -1)
@@ -138,8 +140,6 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
     if ((new_size.x != size.x) || (new_size.y != size.y))
         SetSize( new_size.x, new_size.y );
 
-    SetBackgroundColour( parent->GetBackgroundColour() );
-
     SetValue( value );
 
     Show( TRUE );
@@ -228,6 +228,19 @@ void wxSpinCtrl::SetValue( int value )
     GtkEnableEvents();
 }
 
+void wxSpinCtrl::SetSelection(long from, long to)
+{
+    // translate from wxWindows conventions to GTK+ ones: (-1, -1) means the
+    // entire range
+    if ( from == -1 && to == -1 )
+    {
+        from = 0;
+        to = INT_MAX;
+    }
+
+    gtk_editable_select_region( GTK_EDITABLE(m_widget), (gint)from, (gint)to );
+}
+
 void wxSpinCtrl::SetRange(int minVal, int maxVal)
 {
     wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
@@ -258,7 +271,7 @@ void wxSpinCtrl::OnChar( wxKeyEvent &event )
     if (event.GetKeyCode() == WXK_RETURN)
     {
         wxWindow *top_frame = m_parent;
-        while (top_frame->GetParent() && !(top_frame->GetParent()->IsTopLevel()))
+        while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
             top_frame = top_frame->GetParent();
 
         if ( GTK_IS_WINDOW(top_frame->m_widget) )
@@ -268,7 +281,7 @@ void wxSpinCtrl::OnChar( wxKeyEvent &event )
             {
                 GtkWidget *widgetDef = window->default_widget;
 
-                if ( widgetDef && GTK_IS_WINDOW(widgetDef) )
+                if ( widgetDef )
                 {
                     gtk_widget_activate(widgetDef);
                     return;
@@ -277,6 +290,16 @@ void wxSpinCtrl::OnChar( wxKeyEvent &event )
         }
     }
 
+    if ((event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER))
+    {
+        wxCommandEvent evt( wxEVT_COMMAND_TEXT_ENTER, m_windowId );
+        evt.SetEventObject(this);
+        GtkSpinButton *gsb = GTK_SPIN_BUTTON(m_widget);
+        wxString val = wxGTK_CONV_BACK( gtk_entry_get_text( &gsb->entry ) );
+        evt.SetString( val );
+        if (GetEventHandler()->ProcessEvent(evt)) return;
+    }
+
     event.Skip();
 }