cleanup - added whitespace around operators, some blank lines, fixed comment typos...

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

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index a154a64e21491990b5e7c896e3c4a558982c44e6..c72c8ff60dcbe1258a5eb2581fbab4018f932576 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -10,21 +10,17 @@
 #ifndef __GTKMENUH__
 #define __GTKMENUH__
 
 #ifndef __GTKMENUH__
 #define __GTKMENUH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #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


@@ -48,14 +44,13 @@ 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;
 
 private:
     GtkWidget       *m_menubar;
     long             m_style;
     wxWindow        *m_invokingWindow;
 
 private:

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

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


@@ -63,7 +58,7 @@ private:
 // wxMenu
 //-----------------------------------------------------------------------------
 
 // wxMenu
 //-----------------------------------------------------------------------------
 

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

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


@@ -74,11 +69,6 @@ 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);
-

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


@@ -89,6 +79,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();