Made CCS_VERT definition more general

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

diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h
index 30d31527f3642afba6705f27d67402c4b28a2de1..89d78c23b23c776ebcc6b34a6e7e7973cb260282 100644 (file)
--- a/include/wx/msw/menu.h
+++ b/include/wx/msw/menu.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MENU_H_
 #define _WX_MENU_H_
 
 #ifndef _WX_MENU_H_
 #define _WX_MENU_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "menu.h"
 #endif
 
     #pragma interface "menu.h"
 #endif
 


@@ -20,11 +20,17 @@
     #include "wx/accel.h"
     #include "wx/dynarray.h"
 
     #include "wx/accel.h"
     #include "wx/dynarray.h"
 

-    WX_DEFINE_EXPORTED_ARRAY(wxAcceleratorEntry *, wxAcceleratorArray);
+    WX_DEFINE_EXPORTED_ARRAY_NO_PTR(wxAcceleratorEntry *, wxAcceleratorArray);

 #endif // wxUSE_ACCEL
 
 class WXDLLEXPORT wxFrame;
 
 #endif // wxUSE_ACCEL
 
 class WXDLLEXPORT wxFrame;
 

+#if defined(__WXWINCE__) && wxUSE_TOOLBAR
+class WXDLLEXPORT wxToolBar;
+#endif
+
+#include "wx/arrstr.h"
+

 // ----------------------------------------------------------------------------
 // Menu
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Menu
 // ----------------------------------------------------------------------------


@@ -49,6 +55,17 @@ public:
 
     virtual void SetTitle(const wxString& title);
 
 
     virtual void SetTitle(const wxString& title);
 

+    // deprecated functions
+#if wxUSE_MENU_CALLBACK
+    wxMenu(const wxString& title, const wxFunction func)
+        : wxMenuBase(title)
+    {
+        Init();
+
+        Callback(func);
+    }
+#endif // wxUSE_MENU_CALLBACK
+

     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------
 


@@ -99,7 +116,7 @@ private:
     wxAcceleratorArray m_accels;
 #endif // wxUSE_ACCEL
 
     wxAcceleratorArray m_accels;
 #endif // wxUSE_ACCEL
 

-    DECLARE_DYNAMIC_CLASS(wxMenu)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenu)

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


@@ -128,20 +145,17 @@ 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;
 

-    // compatibility: these functions are deprecated
-#if WXWIN_COMPATIBILITY
-    void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; }
-    wxEvtHandler *GetEventHandler() { return m_eventHandler; }
-
-    bool Enabled(int id) const { return IsEnabled(id); }
-    bool Checked(int id) const { return IsChecked(id); }
-#endif // WXWIN_COMPATIBILITY
-

     // implementation from now on
     WXHMENU Create();
     virtual void Detach();
     virtual void Attach(wxFrame *frame);
 
     // implementation from now on
     WXHMENU Create();
     virtual void Detach();
     virtual void Attach(wxFrame *frame);
 

+#if defined(__WXWINCE__) && wxUSE_TOOLBAR
+    // Under WinCE, a menubar is owned by the frame's toolbar
+    void SetToolBar(wxToolBar* toolBar) { m_toolBar = toolBar; }
+    wxToolBar* GetToolBar() const { return m_toolBar; }
+#endif
+

 #if wxUSE_ACCEL
     // get the accel table for all the menus
     const wxAcceleratorTable& GetAccelTable() const { return m_accelTable; }
 #if wxUSE_ACCEL
     // get the accel table for all the menus
     const wxAcceleratorTable& GetAccelTable() const { return m_accelTable; }


@@ -158,17 +172,13 @@ public:
     void Refresh();
 
     // To avoid compile warning
     void Refresh();
 
     // To avoid compile warning

-    void Refresh( bool eraseBackground = TRUE,
+    void Refresh( bool eraseBackground,

                           const wxRect *rect = (const wxRect *) NULL ) { wxWindow::Refresh(eraseBackground, rect); }
 
 protected:
     // common part of all ctors
     void Init();
 
                           const wxRect *rect = (const wxRect *) NULL ) { wxWindow::Refresh(eraseBackground, rect); }
 
 protected:
     // common part of all ctors
     void Init();
 

-#if WXWIN_COMPATIBILITY
-    wxEvtHandler *m_eventHandler;
-#endif // WXWIN_COMPATIBILITY
-

     wxArrayString m_titles;
 
     WXHMENU       m_hMenu;
     wxArrayString m_titles;
 
     WXHMENU       m_hMenu;


@@ -178,8 +188,12 @@ protected:
     wxAcceleratorTable m_accelTable;
 #endif // wxUSE_ACCEL
 
     wxAcceleratorTable m_accelTable;
 #endif // wxUSE_ACCEL
 

+#if defined(__WXWINCE__) && wxUSE_TOOLBAR
+    wxToolBar*  m_toolBar;
+#endif
+

 private:
 private:

-    DECLARE_DYNAMIC_CLASS(wxMenuBar)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuBar)

 };
 
 #endif // _WX_MENU_H_
 };
 
 #endif // _WX_MENU_H_