remove unused data member

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/private/win_gtk.h b/include/wx/gtk/private/win_gtk.h
index c1f55a85becfbedc72565a80da7b40745f0576ba..f98a775a3df2786371c097da7d201b15e924d0ac 100644 (file)
--- 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 };
 
     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);
     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;
     int m_scroll_y;
     int m_border_style;
     bool m_is_scrollable;

-    void *m_owner;

 };
 
 #endif // _WX_GTK_PIZZA_H_
 };
 
 #endif // _WX_GTK_PIZZA_H_

diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp
index 15e9854112c88b156bf8ebd69249bf9580ae944f..d7a664893d8a9a024b739dad9fd8c6ed343b3ac1 100644 (file)
--- 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);
 
     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 );
     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 df40a213c3714397b760c700850416669749357d..2b7194d3eb36b3a7f84359a75ce81d43b87a042f 100644 (file)
--- 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
     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 );
 
     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 729463a3adb2cf225be0feeb80d8dd30dfc7adb5..50827a0a76c24fa11cd90fc33479ea16f5831e35 100644 (file)
--- a/src/gtk/win_gtk.cpp
+++ b/src/gtk/win_gtk.cpp
@@ -282,11 +282,10 @@ GType wxPizza::type()
     return 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);
 {
     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;
     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 8d8154f246c8e4bcafe748cb75297d931b96b4b5..759ebc9afe77e9ac6e06937059bbaa3beca5915c 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2088,7 +2088,7 @@ bool wxWindowGTK::Create( wxWindow *parent,
 #endif
 
 
 #endif
 
 

-    m_wxwindow = wxPizza::New(m_windowStyle,this);
+    m_wxwindow = wxPizza::New(m_windowStyle);

 #ifndef __WXUNIVERSAL__
     if (HasFlag(wxPizza::BORDER_STYLES))
     {
 #ifndef __WXUNIVERSAL__
     if (HasFlag(wxPizza::BORDER_STYLES))
     {