don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/gtk/popupwin.h b/include/wx/gtk/popupwin.h
index 18b7a743ccc09e135d28410ed94fd2c27249ce24..bb7aa4b0c9741facd994f775a6157616433b361f 100644 (file)
--- a/include/wx/gtk/popupwin.h
+++ b/include/wx/gtk/popupwin.h
@@ -25,20 +25,17 @@ 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);
+    
+    virtual void SetFocus();

 
     // 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();
-

     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 +43,11 @@ 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:

+    virtual void AddChildGTK(wxWindowGTK* child);
+
+#ifdef __WXUNIVERSAL__

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+#endif

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