Reapply wxWeakRef patch again

[wxWidgets.git] / include / wx / gtk / popupwin.h

diff --git a/include/wx/gtk/popupwin.h b/include/wx/gtk/popupwin.h
index 04e00ad33f325f88e3fa0f0ac76eab75532a372a..cb0f7f18dd208c09f79724bddcbf2bc019ec8fd6 100644 (file)
--- a/include/wx/gtk/popupwin.h
+++ b/include/wx/gtk/popupwin.h
@@ -25,20 +25,15 @@ public:
         { (void)Create(parent, flags); }
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 
         { (void)Create(parent, flags); }
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 

-    virtual bool Show( bool show = TRUE );
+    virtual bool Show(bool show = true);

 
     // implementation
     // --------------
 
 
     // implementation
     // --------------
 

-    virtual void OnInternalIdle();
-    

     // GTK time when connecting to button_press signal
     wxUint32  m_time;
 
     // GTK time when connecting to button_press signal
     wxUint32  m_time;
 

-

 protected:
 protected:

-    void GtkOnSize( int x, int y, int width, int height );
-

     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);


@@ -46,7 +41,9 @@ protected:
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
 private:
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
 private:

+#ifdef __WXUNIVERSAL__

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+#endif

     DECLARE_DYNAMIC_CLASS(wxPopupWindow)
 };
 
     DECLARE_DYNAMIC_CLASS(wxPopupWindow)
 };