Updated event type declarations to follow what other sub-libraries do these days...

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

diff --git a/include/wx/gtk/popupwin.h b/include/wx/gtk/popupwin.h
index b32e4684b5c37f7c09576180de2da1e716e531de..bb7aa4b0c9741facd994f775a6157616433b361f 100644 (file)
--- a/include/wx/gtk/popupwin.h
+++ b/include/wx/gtk/popupwin.h
@@ -8,12 +8,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKPOPUPWINH__
-#define __GTKPOPUPWINH__
-
-#include "wx/defs.h"
-#include "wx/panel.h"
-#include "wx/icon.h"
+#ifndef _WX_GTK_POPUPWIN_H_
+#define _WX_GTK_POPUPWIN_H_
 
 //-----------------------------------------------------------------------------
 // wxPopUpWindow
@@ -29,20 +25,17 @@ public:
         { (void)Create(parent, flags); }
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 
-    virtual bool Show( bool show = TRUE );
+    virtual bool Show(bool show = true);
+    
+    virtual void SetFocus();
 
     // implementation
     // --------------
 
-    virtual void OnInternalIdle();
-    
     // GTK time when connecting to button_press signal
     wxUint32  m_time;
 
-
 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);
@@ -50,8 +43,12 @@ protected:
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
 private:
+    virtual void AddChildGTK(wxWindowGTK* child);
+
+#ifdef __WXUNIVERSAL__
     DECLARE_EVENT_TABLE()
+#endif
     DECLARE_DYNAMIC_CLASS(wxPopupWindow)
 };
 
-#endif // __GTKPOPUPWINDOWH__
+#endif // _WX_GTK_POPUPWIN_H_