wxWindow::ReParent()

[wxWidgets.git] / include / wx / gtk1 / window.h

diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h
index 988a87943dcdfc41dd24b60fe6e887ecc03191e6..678c8057dff9fb74cebecb263b5df9575e2e759d 100644 (file)
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/window.h
@@ -72,22 +72,6 @@ public:
     virtual ~wxClientData() { }
 };
 
-//-----------------------------------------------------------------------------
-// wxVoidClientData
-//-----------------------------------------------------------------------------
-
-class wxVoidClientData : public wxClientData
-{
-public:
-    wxVoidClientData() { m_data = NULL; }
-    wxVoidClientData( void *data ) { m_data = data; }
-    void SetData( void* data ) { m_data = data; }
-    void *GetData() const { return m_data; }
-    
-private:
-    void  *m_data;
-};
-
 //-----------------------------------------------------------------------------
 // wxStringClientData
 //-----------------------------------------------------------------------------
@@ -181,6 +165,7 @@ public:
     { return (m_parent ? m_parent->m_parent : (wxWindow*)NULL); }
   void SetParent( wxWindow *p )
     { m_parent = p; }
+  virtual wxWindow *ReParent( wxWindow *newParent );
 
   wxEvtHandler *GetEventHandler();
   void SetEventHandler( wxEvtHandler *handler );
@@ -195,7 +180,6 @@ public:
     
   virtual void SetClientData( void *data );
   virtual void *GetClientData();
-
   
   virtual void SetAcceleratorTable( const wxAcceleratorTable& accel );
   virtual wxAcceleratorTable *GetAcceleratorTable() { return &m_acceleratorTable; }
@@ -297,14 +281,9 @@ public:
   virtual GtkWidget  *GetConnectWidget();
   virtual bool        IsOwnGtkWindow( GdkWindow *window );
           void        ConnectWidget( GtkWidget *widget );
-          void        ConnectDnDWidget( GtkWidget *widget );
-          void        DisconnectDnDWidget( GtkWidget *widget );
   
           bool        HasVMT();
   
-  virtual void        ImplementSetSize();
-  virtual void        ImplementSetPosition();
-  
   virtual wxPoint     GetClientAreaOrigin() const;
   virtual void        AdjustForParentClientOrigin( int& x, int& y, int sizeFlags );
 
@@ -334,7 +313,8 @@ public:
   bool                 m_isEnabled;
   wxString             m_windowName;
   wxAcceleratorTable   m_acceleratorTable;
-  wxClientData        *m_clientData;
+  wxClientData        *m_clientObject;
+  void                *m_clientData;
 
   GtkWidget           *m_widget;
   GtkWidget           *m_wxwindow;