Bo's patch for generic code, more sorting code, WIP

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

diff --git a/include/wx/gtk/popupwin.h b/include/wx/gtk/popupwin.h
index b32e4684b5c37f7c09576180de2da1e716e531de..e150b2d3e79d3f3d03b0c4856d17e890935b4392 100644 (file)
--- a/include/wx/gtk/popupwin.h
+++ b/include/wx/gtk/popupwin.h
@@ -8,12 +8,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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
 
 //-----------------------------------------------------------------------------
 // wxPopUpWindow


@@ -41,7 +37,7 @@ public:
 
 
 protected:
 
 
 protected:

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

 
     virtual void DoSetSize(int x, int y,
                            int width, int height,
 
     virtual void DoSetSize(int x, int y,
                            int width, int height,


@@ -50,8 +46,10 @@ 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:

+    bool m_sizeSet;
+

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

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