X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b904684fb51ee37b2ac32b2bada4bd2ad4fc994..7b25d8e7bd0eca9f0f6efe62b3721d14c394dac9:/src/gtk1/spinctrl.cpp diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp index 2fbffa6771..18e8e0dff2 100644 --- 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 @@ -123,27 +126,10 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id, m_parent->DoAddChild( this ); - PostCreation(); - - SetFont( parent->GetFont() ); - - wxSize size_best( DoGetBestSize() ); - wxSize new_size( size ); - if (new_size.x == -1) - new_size.x = size_best.x; - if (new_size.y == -1) - new_size.y = size_best.y; - if (new_size.y > size_best.y) - new_size.y = size_best.y; - if ((new_size.x != size.x) || (new_size.y != size.y)) - SetSize( new_size.x, new_size.y ); - - SetBackgroundColour( parent->GetBackgroundColour() ); + PostCreation(size); SetValue( value ); - Show( TRUE ); - return TRUE; } @@ -228,6 +214,19 @@ void wxSpinCtrl::SetValue( int value ) GtkEnableEvents(); } +void wxSpinCtrl::SetSelection(long from, long to) +{ + // translate from wxWidgets 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 +257,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 +267,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 +276,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(); } @@ -289,16 +298,21 @@ bool wxSpinCtrl::IsOwnGtkWindow( GdkWindow *window ) return FALSE; } -void wxSpinCtrl::ApplyWidgetStyle() +wxSize wxSpinCtrl::DoGetBestSize() const { - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); + wxSize ret( wxControl::DoGetBestSize() ); + wxSize best(95, ret.y); + CacheBestSize(best); + return best; } -wxSize wxSpinCtrl::DoGetBestSize() const +// static +wxVisualAttributes +wxSpinCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - wxSize ret( wxControl::DoGetBestSize() ); - return wxSize(95, ret.y); + // TODO: overload to accept functions like gtk_spin_button_new? + // Until then use a similar type + return GetDefaultAttributesFromGTKWidget(gtk_entry_new, true); } #endif