porting reordering of controls back from 2.8

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

diff --git a/include/wx/gtk/popupwin.h b/include/wx/gtk/popupwin.h
index e40673b4e6465681a560660ce1cf37119f0fe93f..cb0f7f18dd208c09f79724bddcbf2bc019ec8fd6 100644 (file)
--- a/include/wx/gtk/popupwin.h
+++ b/include/wx/gtk/popupwin.h
@@ -8,22 +8,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKPOPUPWINH__
-#define __GTKPOPUPWINH__
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "popupwin.h"
-#endif
-
-#include "wx/defs.h"
-#include "wx/panel.h"
-#include "wx/icon.h"
+#ifndef _WX_GTK_POPUPWIN_H_
+#define _WX_GTK_POPUPWIN_H_

 
 //-----------------------------------------------------------------------------
 // wxPopUpWindow
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxPopUpWindow
 //-----------------------------------------------------------------------------
 

-class wxPopupWindow: public wxPopupWindowBase
+class WXDLLIMPEXP_CORE wxPopupWindow: public wxPopupWindowBase

 {
 public:
     wxPopupWindow() { }
 {
 public:
     wxPopupWindow() { }


@@ -33,26 +25,26 @@ 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 DoMoveWindow(int x, int y, int width, int height);
-
-    virtual void OnInternalIdle();
-
+    // 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);
 

+    virtual void DoMoveWindow(int x, int y, int width, int height);
+

 private:
 private:

+#ifdef __WXUNIVERSAL__

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+#endif

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

-#endif // __GTKPOPUPWINDOWH__
+#endif // _WX_GTK_POPUPWIN_H_