fix for [ 1020924 ] wx.Display.IsPrimary is wrong

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

diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h
index 8ef7acf09aad683d94d542e2030c33449a125afb..21853e472875667588cbc63d2f203603635858c0 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,7 +20,7 @@
     #include "wx/accel.h"
     #include "wx/dynarray.h"
 
     #include "wx/accel.h"
     #include "wx/dynarray.h"
 

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

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


@@ -29,6 +29,20 @@ class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxToolBar;
 #endif
 
 class WXDLLEXPORT wxToolBar;
 #endif
 

+
+// Not using a combined wxToolBar/wxMenuBar? then use
+// a commandbar in WinCE .NET to implement the
+// menubar, since there is no ::SetMenu function.
+#if defined(__WXWINCE__)
+#   if ((_WIN32_WCE >= 400) && !defined(__POCKETPC__) && !defined(__SMARTPHONE__)) || \
+        defined(__HANDHELDPC__)
+#       define WINCE_WITH_COMMANDBAR
+#   else
+#       define WINCE_WITHOUT_COMMANDBAR
+#   endif
+#endif
+
+

 #include "wx/arrstr.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/arrstr.h"
 
 // ----------------------------------------------------------------------------


@@ -47,9 +61,9 @@ 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);

 
     virtual void Break();
 
 
     virtual void Break();
 


@@ -102,7 +116,7 @@ private:
     // terminate the current radio group, if any
     void EndRadioGroup();
 
     // terminate the current radio group, if any
     void EndRadioGroup();
 

-    // if TRUE, insert a breal before appending the next item
+    // if true, insert a breal before appending the next item

     bool m_doBreak;
 
     // the position of the first item in the current radio group or -1
     bool m_doBreak;
 
     // the position of the first item in the current radio group or -1


@@ -123,6 +137,25 @@ private:
 // Menu Bar (a la Windows)
 // ----------------------------------------------------------------------------
 
 // Menu Bar (a la Windows)
 // ----------------------------------------------------------------------------
 

+class WXDLLEXPORT wxMenuInfo : public wxObject
+{
+public :
+    wxMenuInfo() { m_menu = NULL ; }
+    virtual ~wxMenuInfo() { }
+
+    void Create( wxMenu *menu , const wxString &title )
+    { m_menu = menu ; m_title = title ; }
+    wxMenu* GetMenu() const { return m_menu ; }
+    wxString GetTitle() const { return m_title ; }
+private :
+    wxMenu *m_menu ;
+    wxString m_title ;
+
+    DECLARE_DYNAMIC_CLASS(wxMenuInfo) ;
+} ;
+
+WX_DECLARE_EXPORTED_LIST(wxMenuInfo, wxMenuInfoList );
+

 class WXDLLEXPORT wxMenuBar : public wxMenuBarBase
 {
 public:
 class WXDLLEXPORT wxMenuBar : public wxMenuBarBase
 {
 public:


@@ -136,6 +169,9 @@ public:
     virtual ~wxMenuBar();
 
     // menubar construction
     virtual ~wxMenuBar();
 
     // menubar construction

+    bool Append( wxMenuInfo *info ) { return Append( info->GetMenu() , info->GetTitle() ) ; }
+    const wxMenuInfoList& GetMenuInfos() const ;
+

     virtual bool Append( wxMenu *menu, const wxString &title );
     virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title);
     virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title);
     virtual bool Append( wxMenu *menu, const wxString &title );
     virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title);
     virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title);


@@ -145,15 +181,6 @@ 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();
     // implementation from now on
     WXHMENU Create();
     virtual void Detach();


@@ -165,6 +192,11 @@ public:
     wxToolBar* GetToolBar() const { return m_toolBar; }
 #endif
 
     wxToolBar* GetToolBar() const { return m_toolBar; }
 #endif
 

+#ifdef WINCE_WITH_COMMANDBAR
+    WXHWND GetCommandBar() const { return m_commandBar; }
+    bool AddAdornments(long style);
+#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; }


@@ -188,14 +220,14 @@ protected:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

-#if WXWIN_COMPATIBILITY
-    wxEvtHandler *m_eventHandler;
-#endif // WXWIN_COMPATIBILITY
-
-    wxArrayString m_titles;
+    wxArrayString m_titles ;
+    wxMenuInfoList m_menuInfos;

 
     WXHMENU       m_hMenu;
 
 
     WXHMENU       m_hMenu;
 

+    // Return the MSW position for a wxMenu which is sometimes different from
+    // the wxWidgets position.
+    int MSWPositionForWxMenu(wxMenu *menu, int wxpos);

 #if wxUSE_ACCEL
     // the accelerator table for all accelerators in all our menus
     wxAcceleratorTable m_accelTable;
 #if wxUSE_ACCEL
     // the accelerator table for all accelerators in all our menus
     wxAcceleratorTable m_accelTable;


@@ -205,6 +237,11 @@ protected:
     wxToolBar*  m_toolBar;
 #endif
 
     wxToolBar*  m_toolBar;
 #endif
 

+#ifdef WINCE_WITH_COMMANDBAR
+    WXHWND      m_commandBar;
+    bool        m_adornmentsAdded;
+#endif
+

 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuBar)
 };
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuBar)
 };