Compile fix for the version of VC8 included in the 2003 PSDK.

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

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index dcdba21d724e88c28e49d5def0188100534c3061..cc00c2fd7cb2f461bad578adc4d97a3a70ccf4d8 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -10,10 +10,6 @@
 #ifndef __GTKMENUH__
 #define __GTKMENUH__
 
 #ifndef __GTKMENUH__
 #define __GTKMENUH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "menu.h"
-#endif
-

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


@@ -41,6 +37,11 @@ public:
     virtual void SetLabelTop( size_t pos, const wxString& label );
     virtual wxString GetLabelTop( size_t pos ) const;
 
     virtual void SetLabelTop( size_t pos, const wxString& label );
     virtual wxString GetLabelTop( size_t pos ) const;
 

+    void SetLayoutDirection(wxLayoutDirection dir);
+    wxLayoutDirection GetLayoutDirection() const;
+
+    void Attach(wxFrame *frame);
+

     // implementation only from now on
     void SetInvokingWindow( wxWindow *win );
     void UnsetInvokingWindow( wxWindow *win );
     // implementation only from now on
     void SetInvokingWindow( wxWindow *win );
     void UnsetInvokingWindow( wxWindow *win );


@@ -48,9 +49,6 @@ public:
     // common part of Append and Insert
     bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);
 
     // common part of Append and Insert
     bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);
 

-#ifndef __WXGTK20__
-    GtkAccelGroup   *m_accel;
-#endif

     GtkWidget       *m_menubar;
     long             m_style;
     wxWindow        *m_invokingWindow;
     GtkWidget       *m_menubar;
     long             m_style;
     wxWindow        *m_invokingWindow;


@@ -76,10 +74,10 @@ public:
 
     virtual ~wxMenu();
 
 
     virtual ~wxMenu();
 

-    // implement base class virtuals
-    virtual wxMenuItem* DoAppend(wxMenuItem *item);
-    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
-    virtual wxMenuItem* DoRemove(wxMenuItem *item);
+    void Attach(wxMenuBarBase *menubar);
+
+    void SetLayoutDirection(const wxLayoutDirection dir);
+    wxLayoutDirection GetLayoutDirection() const;

 
     // TODO: virtual void SetTitle(const wxString& title);
 
 
     // TODO: virtual void SetTitle(const wxString& title);
 


@@ -91,6 +89,11 @@ public:
     GtkWidget       *m_owner;
     GtkAccelGroup   *m_accel;
 
     GtkWidget       *m_owner;
     GtkAccelGroup   *m_accel;
 

+protected:
+    virtual wxMenuItem* DoAppend(wxMenuItem *item);
+    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
+    virtual wxMenuItem* DoRemove(wxMenuItem *item);
+

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


@@ -98,9 +101,10 @@ private:
     // common part of Append (if pos == -1)  and Insert
     bool GtkAppend(wxMenuItem *item, int pos=-1);
 
     // common part of Append (if pos == -1)  and Insert
     bool GtkAppend(wxMenuItem *item, int pos=-1);
 

-       GtkWidget *m_prevRadio;
+    GtkWidget *m_prevRadio;

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

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