Cured some Latex problems; fixed i declaration; fixed filedlg.cpp

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

diff --git a/src/gtk1/spinbutt.cpp b/src/gtk1/spinbutt.cpp
index 83eb28ec50fd93cb6b3011828423fa2f7a8128db..dfe03b27a187b7f264f978730c7c448208974359 100644 (file)
--- a/src/gtk1/spinbutt.cpp
+++ b/src/gtk1/spinbutt.cpp
@@ -14,6 +14,10 @@
 
 #include "wx/spinbutt.h"
 #include "wx/utils.h"
+#include <math.h>
+
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
 
 //-----------------------------------------------------------------------------
 // data
@@ -27,31 +31,31 @@ extern bool   g_blockEventsOnDrag;
 
 static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *win )
 { 
-  if (!win->HasVMT()) return;
-  if (g_blockEventsOnDrag) return;
+    if (!win->HasVMT()) return;
+    if (g_blockEventsOnDrag) return;
   
-  float diff = win->m_adjust->value - win->m_oldPos;
-  if (fabs(diff) < 0.2) return;
+    float diff = win->m_adjust->value - win->m_oldPos;
+    if (fabs(diff) < 0.2) return;
   
-  wxEventType command = wxEVT_NULL;
+    wxEventType command = wxEVT_NULL;
   
-  float line_step = win->m_adjust->step_increment;
-  float page_step = win->m_adjust->page_increment;
+    float line_step = win->m_adjust->step_increment;
+    float page_step = win->m_adjust->page_increment;
   
-  if (fabs(diff-line_step) < 0.2) command = wxEVT_SCROLL_LINEDOWN;
-  else if (fabs(diff+line_step) < 0.2) command = wxEVT_SCROLL_LINEUP;
-  else if (fabs(diff-page_step) < 0.2) command = wxEVT_SCROLL_PAGEDOWN;
-  else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP;
-  else command = wxEVT_SCROLL_THUMBTRACK;
+    if (fabs(diff-line_step) < 0.2) command = wxEVT_SCROLL_LINEDOWN;
+    else if (fabs(diff+line_step) < 0.2) command = wxEVT_SCROLL_LINEUP;
+    else if (fabs(diff-page_step) < 0.2) command = wxEVT_SCROLL_PAGEDOWN;
+    else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP;
+    else command = wxEVT_SCROLL_THUMBTRACK;
 
-  int value = (int)(win->m_adjust->value+0.5);
+    int value = (int)(win->m_adjust->value+0.5);
       
-  wxSpinEvent event( command, win->GetId());
-  event.SetPosition( value );
-  event.SetOrientation( wxVERTICAL );
-  event.SetEventObject( win );
+    wxSpinEvent event( command, win->GetId());
+    event.SetPosition( value );
+    event.SetOrientation( wxVERTICAL );
+    event.SetEventObject( win );
   
-  win->ProcessEvent( event );
+    win->ProcessEvent( event );
 }
 
 //-----------------------------------------------------------------------------
@@ -71,38 +75,40 @@ wxSpinButton::wxSpinButton()
 bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
             long style, const wxString& name)
 {
-  m_needParent = TRUE;
+    m_needParent = TRUE;
   
-  wxSize new_size = size;
-  new_size.x = 16;
-  if (new_size.y == -1) new_size.y = 30;
+    wxSize new_size = size;
+    new_size.x = 16;
+    if (new_size.y == -1) new_size.y = 30;
   
-  PreCreation( parent, id, pos, new_size, style, name );
+    PreCreation( parent, id, pos, new_size, style, name );
   
 //  SetValidator( validator );
 
-  m_oldPos = 0.0;
+    m_oldPos = 0.0;
 
-  m_adjust = (GtkAdjustment*) gtk_adjustment_new( 0.0, 0.0, 100.0, 1.0, 5.0, 0.0);
+    m_adjust = (GtkAdjustment*) gtk_adjustment_new( 0.0, 0.0, 100.0, 1.0, 5.0, 0.0);
   
-  m_widget = gtk_spin_button_new( m_adjust, 0, 0 );
+    m_widget = gtk_spin_button_new( m_adjust, 0, 0 );
     
-  gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget), (m_windowStyle & wxSP_WRAP) );
+    gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget), (m_windowStyle & wxSP_WRAP) );
        
-  gtk_signal_connect (GTK_OBJECT (m_adjust), "value_changed",
-                     (GtkSignalFunc) gtk_spinbutt_callback, (gpointer) this );
+    gtk_signal_connect( GTK_OBJECT (m_adjust), 
+                        "value_changed",
+                       (GtkSignalFunc) gtk_spinbutt_callback, 
+                       (gpointer) this );
   
-  m_parent->AddChild( this );
+    m_parent->AddChild( this );
 
-  (m_parent->m_insertCallback)( m_parent, this );
+    (m_parent->m_insertCallback)( m_parent, this );
   
-  PostCreation();
+    PostCreation();
   
-  SetBackgroundColour( parent->GetBackgroundColour() );
+    SetBackgroundColour( parent->GetBackgroundColour() );
 
-  Show( TRUE );
+    Show( TRUE );
     
-  return TRUE;
+    return TRUE;
 }
 
 wxSpinButton::~wxSpinButton()
@@ -111,71 +117,74 @@ wxSpinButton::~wxSpinButton()
 
 int wxSpinButton::GetMin() const
 {
-  wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
+    wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
   
-  return (int)(m_adjust->lower+0.5);
+    return (int)(m_adjust->lower+0.5);
 }
 
 int wxSpinButton::GetMax() const
 {
-  wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
+    wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
   
-  return (int)(m_adjust->upper+0.5);
+    return (int)(m_adjust->upper+0.5);
 }
 
 int wxSpinButton::GetValue() const
 {
-  wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
+    wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
   
-  return (int)(m_adjust->value+0.5);
+    return (int)(m_adjust->value+0.5);
 }
 
 void wxSpinButton::SetValue( int value )
 {
-  wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
+    wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
   
-  float fpos = (float)value;
-  m_oldPos = fpos;
-  if (fabs(fpos-m_adjust->value) < 0.2) return;
-  m_adjust->value = fpos;
+    float fpos = (float)value;
+    m_oldPos = fpos;
+    if (fabs(fpos-m_adjust->value) < 0.2) return;
+    
+    m_adjust->value = fpos;
   
-  gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
+    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
-  wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
+    wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
   
-  float fmin = (float)minVal;
-  float fmax = (float)maxVal;
+    float fmin = (float)minVal;
+    float fmax = (float)maxVal;
       
-  if ((fabs(fmin-m_adjust->lower) < 0.2) &&
-      (fabs(fmax-m_adjust->upper) < 0.2))
-      return;
+    if ((fabs(fmin-m_adjust->lower) < 0.2) &&
+        (fabs(fmax-m_adjust->upper) < 0.2))
+    {
+        return;
+    }
       
-  m_adjust->lower = fmin;
-  m_adjust->upper = fmax;
+    m_adjust->lower = fmin;
+    m_adjust->upper = fmax;
 
-  gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
 }
 
 void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
-  wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
+    wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
   
-  m_width = 16;
-  gtk_widget_set_usize( m_widget, m_width, m_height );
+    m_width = 16;
+    gtk_widget_set_usize( m_widget, m_width, m_height );
 }
 
 bool wxSpinButton::IsOwnGtkWindow( GdkWindow *window )
 {
-  return GTK_SPIN_BUTTON(m_widget)->panel == window;
+    return GTK_SPIN_BUTTON(m_widget)->panel == window;
 }
 
 void wxSpinButton::ApplyWidgetStyle()
 {
-  SetWidgetStyle();
-  gtk_widget_set_style( m_widget, m_widgetStyle );
+    SetWidgetStyle();
+    gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
 //-----------------------------------------------------------------------------