Set/GetTitle out of wxWindowBase, forked and put to gtk/window.h and mgl/window.h...

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

diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h
index 9ea6e9a338b2833be24993c789584d4055d4bca2..29472ce14cc45f7890f99cb2960d8b55d608f330 100644 (file)
--- a/include/wx/msw/menu.h
+++ b/include/wx/msw/menu.h
@@ -49,14 +49,16 @@ public:
 
     virtual void SetTitle(const wxString& title);
 
 
     virtual void SetTitle(const wxString& title);
 

-    // MSW-specific
-    bool ProcessCommand(wxCommandEvent& event);
-
+    // deprecated functions
+#if wxUSE_MENU_CALLBACK

     wxMenu(const wxString& title, const wxFunction func)
         : wxMenuBase(title)
     {
     wxMenu(const wxString& title, const wxFunction func)
         : wxMenuBase(title)
     {

+        Init();
+

         Callback(func);
     }
         Callback(func);
     }

+#endif // wxUSE_MENU_CALLBACK

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


@@ -69,10 +71,6 @@ public:
         // get the menu handle
     WXHMENU GetHMenu() const { return m_hMenu; }
 
         // get the menu handle
     WXHMENU GetHMenu() const { return m_hMenu; }
 

-    // attach/detach menu to/from wxMenuBar
-    void Attach(wxMenuBar *menubar);
-    void Detach();
-

 #if wxUSE_ACCEL
     // called by wxMenuBar to build its accel table from the accels of all menus
     bool HasAccels() const { return !m_accels.IsEmpty(); }
 #if wxUSE_ACCEL
     // called by wxMenuBar to build its accel table from the accels of all menus
     bool HasAccels() const { return !m_accels.IsEmpty(); }


@@ -129,10 +127,6 @@ public:
     virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title);
     virtual wxMenu *Remove(size_t pos);
 
     virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title);
     virtual wxMenu *Remove(size_t pos);
 

-    virtual int FindMenuItem(const wxString& menuString,
-                             const wxString& itemString) const;
-    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 EnableTop( size_t pos, bool flag );
     virtual void SetLabelTop( size_t pos, const wxString& label );
     virtual wxString GetLabelTop( size_t pos ) const;


@@ -148,15 +142,8 @@ public:
 
     // implementation from now on
     WXHMENU Create();
 
     // implementation from now on
     WXHMENU Create();

-    int  FindMenu(const wxString& title);
-    void Detach();
-
-        // returns TRUE if we're attached to a frame
-    bool IsAttached() const { return m_menuBarFrame != NULL; }
-        // get the frame we live in
-    wxFrame *GetFrame() const { return m_menuBarFrame; }
-        // attach to a frame
-    void Attach(wxFrame *frame);
+    virtual void Detach();
+    virtual void Attach(wxFrame *frame);

 
 #if wxUSE_ACCEL
     // get the accel table for all the menus
 
 #if wxUSE_ACCEL
     // get the accel table for all the menus


@@ -183,7 +170,6 @@ protected:
 
     wxArrayString m_titles;
 
 
     wxArrayString m_titles;
 

-    wxFrame      *m_menuBarFrame;

     WXHMENU       m_hMenu;
 
 #if wxUSE_ACCEL
     WXHMENU       m_hMenu;
 
 #if wxUSE_ACCEL