Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed memory leak and removed duplicated code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-06-24 18:11:29 +00:00
parent da21012040
commit 93d23d8faf
2 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gtk/window.cpp
View File

@@ -2695,17 +2695,6 @@ bool wxWindowGTK::Create( wxWindow *parent,
gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed", gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed",
(GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this ); (GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this );
#ifdef __WXGTK20__
// Create input method handler
m_imContext = gtk_im_multicontext_new();
// Cannot handle drawing preedited text yet
gtk_im_context_set_use_preedit( m_imContext, FALSE );
g_signal_connect (G_OBJECT (m_imContext), "commit",
G_CALLBACK (gtk_wxwindow_commit_cb), this);
#endif
gtk_widget_show( m_wxwindow ); gtk_widget_show( m_wxwindow );
if (m_parent) if (m_parent)
@@ -2801,6 +2790,7 @@ void wxWindowGTK::PostCreation()
#else #else
// gtk_widget_set_redraw_on_allocate( GTK_WIDGET(m_wxwindow), !HasFlag( wxFULL_REPAINT_ON_RESIZE ) ); // gtk_widget_set_redraw_on_allocate( GTK_WIDGET(m_wxwindow), !HasFlag( wxFULL_REPAINT_ON_RESIZE ) );
#endif #endif
}
#ifdef __WXGTK20__ #ifdef __WXGTK20__
// Create input method handler // Create input method handler
@@ -2812,7 +2802,6 @@ void wxWindowGTK::PostCreation()
g_signal_connect (G_OBJECT (m_imContext), "commit", g_signal_connect (G_OBJECT (m_imContext), "commit",
G_CALLBACK (gtk_wxwindow_commit_cb), this); G_CALLBACK (gtk_wxwindow_commit_cb), this);
#endif #endif
}
// these are called when the "sunken" or "raised" borders are drawn // these are called when the "sunken" or "raised" borders are drawn
gtk_signal_connect( GTK_OBJECT(m_widget), "expose_event", gtk_signal_connect( GTK_OBJECT(m_widget), "expose_event",

13
src/gtk1/window.cpp
View File

@@ -2695,17 +2695,6 @@ bool wxWindowGTK::Create( wxWindow *parent,
gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed", gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed",
(GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this ); (GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this );
#ifdef __WXGTK20__
// Create input method handler
m_imContext = gtk_im_multicontext_new();
// Cannot handle drawing preedited text yet
gtk_im_context_set_use_preedit( m_imContext, FALSE );
g_signal_connect (G_OBJECT (m_imContext), "commit",
G_CALLBACK (gtk_wxwindow_commit_cb), this);
#endif
gtk_widget_show( m_wxwindow ); gtk_widget_show( m_wxwindow );
if (m_parent) if (m_parent)
@@ -2801,6 +2790,7 @@ void wxWindowGTK::PostCreation()
#else #else
// gtk_widget_set_redraw_on_allocate( GTK_WIDGET(m_wxwindow), !HasFlag( wxFULL_REPAINT_ON_RESIZE ) ); // gtk_widget_set_redraw_on_allocate( GTK_WIDGET(m_wxwindow), !HasFlag( wxFULL_REPAINT_ON_RESIZE ) );
#endif #endif
}
#ifdef __WXGTK20__ #ifdef __WXGTK20__
// Create input method handler // Create input method handler
@@ -2812,7 +2802,6 @@ void wxWindowGTK::PostCreation()
g_signal_connect (G_OBJECT (m_imContext), "commit", g_signal_connect (G_OBJECT (m_imContext), "commit",
G_CALLBACK (gtk_wxwindow_commit_cb), this); G_CALLBACK (gtk_wxwindow_commit_cb), this);
#endif #endif
}
// these are called when the "sunken" or "raised" borders are drawn // these are called when the "sunken" or "raised" borders are drawn
gtk_signal_connect( GTK_OBJECT(m_widget), "expose_event", gtk_signal_connect( GTK_OBJECT(m_widget), "expose_event",