Fixed URL saving/loading

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

diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp
index 91d83bb213c9dc504d839c22ff97afefe3e2b2ca..e2a7824071a925deb7b8941be2a83e3542df5b0c 100644 (file)
--- a/src/gtk1/spinctrl.cpp
+++ b/src/gtk1/spinctrl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -11,15 +11,17 @@
 // 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/gtk/private.h"
+#include "wx/gtk1/private.h"

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -77,7 +79,7 @@ gtk_spinctrl_text_changed_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win
 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
     event.SetEventObject( win );
 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
     event.SetEventObject( win );

-    
+

     // see above
     event.SetInt( (int)ceil(win->m_adjust->value) );
     win->GetEventHandler()->ProcessEvent( event );
     // see above
     event.SetInt( (int)ceil(win->m_adjust->value) );
     win->GetEventHandler()->ProcessEvent( event );


@@ -101,14 +103,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;


@@ -116,19 +118,19 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
     m_adjust = (GtkAdjustment*) gtk_adjustment_new( initial, min, max, 1.0, 5.0, 0.0);
 
     m_widget = gtk_spin_button_new( m_adjust, 1, 0 );
     m_adjust = (GtkAdjustment*) gtk_adjustment_new( initial, min, max, 1.0, 5.0, 0.0);
 
     m_widget = gtk_spin_button_new( m_adjust, 1, 0 );

-    
+

     gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget),
                               (int)(m_windowStyle & wxSP_WRAP) );
 
     GtkEnableEvents();
     gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget),
                               (int)(m_windowStyle & wxSP_WRAP) );
 
     GtkEnableEvents();

-    
+

     m_parent->DoAddChild( this );
 
     PostCreation(size);
 
     SetValue( value );
 
     m_parent->DoAddChild( this );
 
     PostCreation(size);
 
     SetValue( value );
 

-    return TRUE;
+    return true;

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


@@ -148,7 +150,7 @@ void wxSpinCtrl::GtkEnableEvents()
                         "value_changed",
                         GTK_SIGNAL_FUNC(gtk_spinctrl_callback),
                         (gpointer) this );
                         "value_changed",
                         GTK_SIGNAL_FUNC(gtk_spinctrl_callback),
                         (gpointer) this );

-    
+

     gtk_signal_connect( GTK_OBJECT(m_widget),
                         "changed",
                         GTK_SIGNAL_FUNC(gtk_spinctrl_text_changed_callback),
     gtk_signal_connect( GTK_OBJECT(m_widget),
                         "changed",
                         GTK_SIGNAL_FUNC(gtk_spinctrl_text_changed_callback),


@@ -274,7 +276,7 @@ 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);
     {
         wxCommandEvent evt( wxEVT_COMMAND_TEXT_ENTER, m_windowId );
         evt.SetEventObject(this);


@@ -289,11 +291,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)->panel == 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;

 
 

-    return FALSE;
+    return false;

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