fix memory leak (coverity checker CID 53)

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

diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp
index 18e8e0dff21043ba40bf6b1bd96044244fd19225..9820526690598e1c16ec78ee9b18c0d00c629e7d 100644 (file)
--- a/src/gtk1/spinctrl.cpp
+++ b/src/gtk1/spinctrl.cpp
@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "spinctrl.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -22,10 +18,8 @@
 #include "wx/utils.h"
 
 #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
 #include "wx/utils.h"
 
 #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED

-
-#include <math.h>
-
-#include "wx/gtk/private.h"
+#include "wx/math.h"
+#include "wx/gtk1/private.h"

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


@@ -46,6 +40,7 @@ extern bool   g_blockEventsOnDrag;
 // "value_changed"
 //-----------------------------------------------------------------------------
 
 // "value_changed"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void gtk_spinctrl_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();
 static void gtk_spinctrl_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();


@@ -65,11 +60,13 @@ static void gtk_spinctrl_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win
     event.SetInt( (int)ceil(win->m_adjust->value) );
     win->GetEventHandler()->ProcessEvent( event );
 }
     event.SetInt( (int)ceil(win->m_adjust->value) );
     win->GetEventHandler()->ProcessEvent( event );
 }

+}

 
 //-----------------------------------------------------------------------------
 //  "changed"
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 //  "changed"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void
 gtk_spinctrl_text_changed_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win )
 {
 static void
 gtk_spinctrl_text_changed_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win )
 {


@@ -80,11 +77,12 @@ 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 );
 }

+}

 
 //-----------------------------------------------------------------------------
 // wxSpinCtrl
 
 //-----------------------------------------------------------------------------
 // wxSpinCtrl


@@ -118,12 +116,12 @@ 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);
     m_parent->DoAddChild( this );
 
     PostCreation(size);


@@ -150,7 +148,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),


@@ -292,7 +290,7 @@ void wxSpinCtrl::OnChar( wxKeyEvent &event )
 bool wxSpinCtrl::IsOwnGtkWindow( GdkWindow *window )
 {
     if (GTK_SPIN_BUTTON(m_widget)->entry.text_area == window) return TRUE;
 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;
 
     return FALSE;
     if (GTK_SPIN_BUTTON(m_widget)->panel == window) return TRUE;
 
     return FALSE;