Added support for dBase, PostGres, MySQL, Access, MS SQL Server.

[wxWidgets.git] / include / wx / gtk1 / menu.h

diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h
index f571fe084edf377de5056b88c869942b1a4d5a85..8d6f68db7ec288ce0113cc4b6718766c65cc0e24 100644 (file)
--- a/include/wx/gtk1/menu.h
+++ b/include/wx/gtk1/menu.h
@@ -93,10 +93,15 @@ public:
     // implementation only
     wxList& GetMenus() { return m_menus; }
 
     // implementation only
     wxList& GetMenus() { return m_menus; }
 

+    void SetInvokingWindow( wxWindow *win );
+    void UnsetInvokingWindow( wxWindow *win );
+

     GtkAccelGroup   *m_accel;
     GtkItemFactory  *m_factory;
     wxList           m_menus;
     GtkWidget       *m_menubar;
     GtkAccelGroup   *m_accel;
     GtkItemFactory  *m_factory;
     wxList           m_menus;
     GtkWidget       *m_menubar;

+    long             m_style;
+    wxWindow        *m_invokingWindow;

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -108,8 +113,19 @@ class wxMenu : public wxEvtHandler
     DECLARE_DYNAMIC_CLASS(wxMenu)
 
 public:
     DECLARE_DYNAMIC_CLASS(wxMenu)
 
 public:

-    wxMenu( const wxString& title = wxEmptyString,
-            const wxFunction func = (wxFunction) NULL );
+    wxMenu( const wxString& title, const wxFunction func)
+    {
+        Init(title, 0, func);
+    }
+    wxMenu( long style )
+    {
+        Init( wxEmptyString, style );
+    }
+    wxMenu( const wxString& title = wxEmptyString, long style = 0 )
+    {
+        Init(title, style);
+    }
+

     ~wxMenu();
 
     // operations
     ~wxMenu();
 
     // operations


@@ -159,13 +175,16 @@ public:
 
     wxMenuItem *FindItemForId( int id ) const { return FindItem( id ); }
 
 
     wxMenuItem *FindItemForId( int id ) const { return FindItem( id ); }
 

-#ifdef WXWIN_COMPATIBILITY

     wxFunction GetCallback() const { return m_callback; }
     void Callback(const wxFunction func) { m_callback = func; }
     wxFunction GetCallback() const { return m_callback; }
     void Callback(const wxFunction func) { m_callback = func; }

+    wxFunction m_callback;
+
+#ifdef WXWIN_COMPATIBILITY

 
     // compatibility: these functions are deprecated
     bool Enabled(int id) const { return IsEnabled(id); }
     bool Checked(int id) const { return IsChecked(id); }
 
     // compatibility: these functions are deprecated
     bool Enabled(int id) const { return IsEnabled(id); }
     bool Checked(int id) const { return IsChecked(id); }

+

 #endif // WXWIN_COMPATIBILITY
 
     // implementation
 #endif // WXWIN_COMPATIBILITY
 
     // implementation


@@ -179,14 +198,21 @@ public:
     GtkAccelGroup   *m_accel;
     GtkItemFactory  *m_factory;
 
     GtkAccelGroup   *m_accel;
     GtkItemFactory  *m_factory;
 

+    // used by wxMenuBar
+    long GetStyle(void) const { return m_style; }
+

 private:
 private:

+    // common code for both constructors:
+    void Init( const wxString& title,
+               long style, 
+               const wxFunction func = (wxFunction) NULL );

 
     wxString       m_title;
     wxList         m_items;
     wxWindow      *m_invokingWindow;
 
     wxString       m_title;
     wxList         m_items;
     wxWindow      *m_invokingWindow;

-    wxFunction     m_callback;

     wxEvtHandler  *m_eventHandler;
     void          *m_clientData;
     wxEvtHandler  *m_eventHandler;
     void          *m_clientData;

+    long           m_style;

 };
 
 #endif // __GTKMENUH__
 };
 
 #endif // __GTKMENUH__