Fix AdjustForOverflow to use item->CalcMin, not item->GetSize

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

diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp
index 12718d6159f9ee0cdf138e7a6bd259571a15c1a3..f0beb6ac45b8ba1f5ce21eff95a2d03460232d45 100644 (file)
--- a/src/gtk1/spinctrl.cpp
+++ b/src/gtk1/spinctrl.cpp
@@ -17,10 +17,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"

+    #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
+    #include "wx/math.h"

 #endif
 
 #endif
 

-#include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
-#include "wx/math.h"

 #include "wx/gtk1/private.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/gtk1/private.h"
 
 //-----------------------------------------------------------------------------


@@ -60,7 +60,7 @@ static void gtk_spinctrl_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win
     // values in range 5..50 is then, ummm, quite challenging (hint: you can't
     // enter 1!) (VZ)
     event.SetInt( (int)ceil(win->m_adjust->value) );
     // values in range 5..50 is then, ummm, quite challenging (hint: you can't
     // enter 1!) (VZ)
     event.SetInt( (int)ceil(win->m_adjust->value) );

-    win->GetEventHandler()->ProcessEvent( event );
+    win->HandleWindowEvent( event );

 }
 }
 
 }
 }
 


@@ -82,7 +82,7 @@ gtk_spinctrl_text_changed_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win
 
     // see above
     event.SetInt( (int)ceil(win->m_adjust->value) );
 
     // see above
     event.SetInt( (int)ceil(win->m_adjust->value) );

-    win->GetEventHandler()->ProcessEvent( event );
+    win->HandleWindowEvent( event );

 }
 }
 
 }
 }
 


@@ -283,7 +283,7 @@ void wxSpinCtrl::OnChar( wxKeyEvent &event )
         GtkSpinButton *gsb = GTK_SPIN_BUTTON(m_widget);
         wxString val = wxGTK_CONV_BACK( gtk_entry_get_text( &gsb->entry ) );
         evt.SetString( val );
         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;
+        if (HandleWindowEvent(evt)) return;

     }
 
     event.Skip();
     }
 
     event.Skip();