In wxComboCtrlBase::OnTextCtrlEvent(), make sure to call event.StopPropagation()...

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

diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp
index 9820526690598e1c16ec78ee9b18c0d00c629e7d..9bfab34a2ba2e576fc4a0b9f86321f623165d997 100644 (file)
--- a/src/gtk1/spinctrl.cpp
+++ b/src/gtk1/spinctrl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        spinbutt.cpp
+// Name:        src/gtk1/spinctrl.cpp

 // Purpose:     wxSpinCtrl
 // Author:      Robert
 // Modified by:
 // Purpose:     wxSpinCtrl
 // Author:      Robert
 // Modified by:


@@ -11,14 +11,16 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/spinctrl.h"
-

 #if wxUSE_SPINCTRL
 
 #if wxUSE_SPINCTRL
 

-#include "wx/utils.h"
+#include "wx/spinctrl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
+    #include "wx/math.h"
+#endif

 
 

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

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


@@ -58,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 );

 }
 }
 
 }
 }
 


@@ -80,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 );

 }
 }
 
 }
 }
 


@@ -88,8 +90,6 @@ gtk_spinctrl_text_changed_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win
 // wxSpinCtrl
 //-----------------------------------------------------------------------------
 
 // wxSpinCtrl
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl,wxControl)
-

 BEGIN_EVENT_TABLE(wxSpinCtrl, wxControl)
     EVT_CHAR(wxSpinCtrl::OnChar)
 END_EVENT_TABLE()
 BEGIN_EVENT_TABLE(wxSpinCtrl, wxControl)
     EVT_CHAR(wxSpinCtrl::OnChar)
 END_EVENT_TABLE()


@@ -101,14 +101,14 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
                         int min, int max, int initial,
                         const wxString& name)
 {
                         int min, int max, int initial,
                         const wxString& name)
 {

-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
+    m_needParent = true;
+    m_acceptsFocus = true;

 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxSpinCtrl creation failed") );
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxSpinCtrl creation failed") );

-        return FALSE;
+        return false;

     }
 
     m_oldPos = initial;
     }
 
     m_oldPos = initial;


@@ -128,7 +128,7 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
 
     SetValue( value );
 
 
     SetValue( value );
 

-    return TRUE;
+    return true;

 }
 
 void wxSpinCtrl::GtkDisableEvents()
 }
 
 void wxSpinCtrl::GtkDisableEvents()


@@ -274,14 +274,14 @@ void wxSpinCtrl::OnChar( wxKeyEvent &event )
         }
     }
 
         }
     }
 

-    if ((event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER))
+    if ((event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxTE_PROCESS_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 );
     {
         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;
+        if (HandleWindowEvent(evt)) return;

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


@@ -289,11 +289,11 @@ void wxSpinCtrl::OnChar( wxKeyEvent &event )
 
 bool wxSpinCtrl::IsOwnGtkWindow( GdkWindow *window )
 {
 
 bool wxSpinCtrl::IsOwnGtkWindow( GdkWindow *window )
 {

-    if (GTK_SPIN_BUTTON(m_widget)->entry.text_area == window) return TRUE;
+    if (GTK_SPIN_BUTTON(m_widget)->entry.text_area == window) return true;

 
 

-    if (GTK_SPIN_BUTTON(m_widget)->panel == window) return TRUE;
+    if (GTK_SPIN_BUTTON(m_widget)->panel == window) return true;

 
 

-    return FALSE;
+    return false;

 }
 
 wxSize wxSpinCtrl::DoGetBestSize() const
 }
 
 wxSize wxSpinCtrl::DoGetBestSize() const