From 0f52f6108511e4320eab81beb94c92c7657ee7bf Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Tue, 1 Dec 2009 16:23:48 +0000 Subject: [PATCH] remove unused data member git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/private/win_gtk.h | 3 +-- src/gtk/popupwin.cpp | 2 +- src/gtk/toplevel.cpp | 2 +- src/gtk/win_gtk.cpp | 3 +-- src/gtk/window.cpp | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/include/wx/gtk/private/win_gtk.h b/include/wx/gtk/private/win_gtk.h index c1f55a8..f98a775 100644 --- a/include/wx/gtk/private/win_gtk.h +++ b/include/wx/gtk/private/win_gtk.h @@ -21,7 +21,7 @@ struct WXDLLIMPEXP_CORE wxPizza enum { BORDER_STYLES = wxBORDER_SIMPLE | wxBORDER_RAISED | wxBORDER_SUNKEN | wxBORDER_THEME }; - static GtkWidget* New(long windowStyle, void *owner); + static GtkWidget* New(long windowStyle = 0); static GType type(); void move(GtkWidget* widget, int x, int y); void scroll(int dx, int dy); @@ -33,7 +33,6 @@ struct WXDLLIMPEXP_CORE wxPizza int m_scroll_y; int m_border_style; bool m_is_scrollable; - void *m_owner; }; #endif // _WX_GTK_PIZZA_H_ diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp index 15e9854..d7a6648 100644 --- a/src/gtk/popupwin.cpp +++ b/src/gtk/popupwin.cpp @@ -133,7 +133,7 @@ bool wxPopupWindow::Create( wxWindow *parent, int style ) g_signal_connect (m_widget, "delete_event", G_CALLBACK (gtk_dialog_delete_callback), this); - m_wxwindow = wxPizza::New(m_windowStyle, this); + m_wxwindow = wxPizza::New(m_windowStyle); gtk_widget_show( m_wxwindow ); gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow ); diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp index df40a21..2b7194d 100644 --- a/src/gtk/toplevel.cpp +++ b/src/gtk/toplevel.cpp @@ -558,7 +558,7 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, gtk_container_add( GTK_CONTAINER(m_widget), m_mainWidget ); // m_wxwindow is the client area - m_wxwindow = wxPizza::New(0,this); + m_wxwindow = wxPizza::New(); gtk_widget_show( m_wxwindow ); gtk_container_add( GTK_CONTAINER(m_mainWidget), m_wxwindow ); diff --git a/src/gtk/win_gtk.cpp b/src/gtk/win_gtk.cpp index 729463a..50827a0 100644 --- a/src/gtk/win_gtk.cpp +++ b/src/gtk/win_gtk.cpp @@ -282,11 +282,10 @@ GType wxPizza::type() return type; } -GtkWidget* wxPizza::New(long windowStyle,void* owner) +GtkWidget* wxPizza::New(long windowStyle) { GtkWidget* widget = GTK_WIDGET(g_object_new(type(), NULL)); wxPizza* pizza = WX_PIZZA(widget); - pizza->m_owner = owner; pizza->m_backing_window = NULL; pizza->m_scroll_x = 0; pizza->m_scroll_y = 0; diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 8d8154f..759ebc9 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -2088,7 +2088,7 @@ bool wxWindowGTK::Create( wxWindow *parent, #endif - m_wxwindow = wxPizza::New(m_windowStyle,this); + m_wxwindow = wxPizza::New(m_windowStyle); #ifndef __WXUNIVERSAL__ if (HasFlag(wxPizza::BORDER_STYLES)) { -- 2.7.4