Fix a number of mingw compile errors.

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

diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h
index 13d2f6b343f4ecefb3e4be441700a088d58783ca..aca498bcc29b92957842a038a007e418e9e08768 100644 (file)
--- a/include/wx/gtk1/menu.h
+++ b/include/wx/gtk1/menu.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/gtk/menu.h
+// Name:        wx/gtk1/menu.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,21 +10,17 @@
 #ifndef __GTKMENUH__
 #define __GTKMENUH__
 
 #ifndef __GTKMENUH__
 #define __GTKMENUH__
 

-#ifdef __GNUG__
-    #pragma interface "menu.h"
-#endif
-

 //-----------------------------------------------------------------------------
 // wxMenuBar
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxMenuBar
 //-----------------------------------------------------------------------------
 

-class wxMenuBar : public wxMenuBarBase
+class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase

 {
 public:
     // ctors
     wxMenuBar();
     wxMenuBar(long style);
 {
 public:
     // ctors
     wxMenuBar();
     wxMenuBar(long style);

-    wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
+    wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);

     virtual ~wxMenuBar();
 
     // implement base class (pure) virtuals
     virtual ~wxMenuBar();
 
     // implement base class (pure) virtuals


@@ -38,20 +34,22 @@ public:
     virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const;
 
     virtual void EnableTop( size_t pos, bool flag );
     virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const;
 
     virtual void EnableTop( size_t pos, bool flag );

-    virtual void SetLabelTop( size_t pos, const wxString& label );
-    virtual wxString GetLabelTop( size_t pos ) const;
+    virtual void SetMenuLabel( size_t pos, const wxString& label );
+    virtual wxString GetMenuLabel( size_t pos ) const;
+
+    // common part of Append and Insert
+    bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);

 
 

-    // implementation only from now on
-    void SetInvokingWindow( wxWindow *win );
-    void UnsetInvokingWindow( wxWindow *win );
+    virtual void Attach(wxFrame *frame);
+    virtual void Detach();

 
     GtkAccelGroup   *m_accel;
 
     GtkAccelGroup   *m_accel;

-    GtkItemFactory  *m_factory;

     GtkWidget       *m_menubar;
     long             m_style;
     GtkWidget       *m_menubar;
     long             m_style;

-    wxWindow        *m_invokingWindow;

 
 private:
 
 private:

+    void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
+

     DECLARE_DYNAMIC_CLASS(wxMenuBar)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMenuBar)
 };
 


@@ -59,7 +57,7 @@ private:
 // wxMenu
 //-----------------------------------------------------------------------------
 
 // wxMenu
 //-----------------------------------------------------------------------------
 

-class wxMenu : public wxMenuBase
+class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase

 {
 public:
     // ctors & dtor
 {
 public:
     // ctors & dtor


@@ -71,19 +69,14 @@ public:
     virtual ~wxMenu();
 
     // implement base class virtuals
     virtual ~wxMenu();
 
     // implement base class virtuals

-    virtual bool DoAppend(wxMenuItem *item);
-    virtual bool DoInsert(size_t pos, wxMenuItem *item);
-    virtual wxMenuItem *DoRemove(wxMenuItem *item);
+    virtual wxMenuItem* DoAppend(wxMenuItem *item);
+    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
+    virtual wxMenuItem* DoRemove(wxMenuItem *item);

 
 

-    // TODO: virtual void SetTitle(const wxString& title);
+    // Returns the title, with mnemonics translated to wx format
+    wxString GetTitle() const;

 
 

-#if WXWIN_COMPATIBILITY
-    wxMenu(const wxString& title, const wxFunction func)
-        : wxMenuBase(title)
-    {
-        Callback(func);
-    }
-#endif // WXWIN_COMPATIBILITY
+    // TODO: virtual void SetTitle(const wxString& title);

 
     // implementation
     int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
 
     // implementation
     int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;


@@ -92,13 +85,18 @@ public:
     GtkWidget       *m_menu;  // GtkMenu
     GtkWidget       *m_owner;
     GtkAccelGroup   *m_accel;
     GtkWidget       *m_menu;  // GtkMenu
     GtkWidget       *m_owner;
     GtkAccelGroup   *m_accel;

-    GtkItemFactory  *m_factory;

 
 private:
     // common code for all constructors:
     void Init();
 
 
 private:
     // common code for all constructors:
     void Init();
 

+    // common part of Append (if pos == -1)  and Insert
+    bool GtkAppend(wxMenuItem *item, int pos=-1);
+
+    GtkWidget *m_prevRadio;
+

     DECLARE_DYNAMIC_CLASS(wxMenu)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMenu)
 };
 

-#endif // __GTKMENUH__
+#endif
+    // __GTKMENUH__