compilation fix

[wxWidgets.git] / include / wx / cmdproc.h

diff --git a/include/wx/cmdproc.h b/include/wx/cmdproc.h
index 3b09e400bdcaa6f78dce111524730d9aea84d652..13523e077e9f57ec0d9cde3d0c8ce6588cb81884 100644 (file)
--- a/include/wx/cmdproc.h
+++ b/include/wx/cmdproc.h
@@ -12,13 +12,15 @@
 #ifndef _WX_CMDPROC_H_
 #define _WX_CMDPROC_H_
 
 #ifndef _WX_CMDPROC_H_
 #define _WX_CMDPROC_H_
 

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

     #pragma interface "cmdproc.h"
 #endif
 
 #include "wx/object.h"
 #include "wx/list.h"
 
     #pragma interface "cmdproc.h"
 #endif
 
 #include "wx/object.h"
 #include "wx/list.h"
 

+class WXDLLEXPORT wxMenu;
+

 // ----------------------------------------------------------------------------
 // wxCommand: a single command capable of performing itself
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxCommand: a single command capable of performing itself
 // ----------------------------------------------------------------------------


@@ -26,7 +28,7 @@
 class WXDLLEXPORT wxCommand : public wxObject
 {
 public:
 class WXDLLEXPORT wxCommand : public wxObject
 {
 public:

-    wxCommand(bool canUndoIt = FALSE, const wxString& name = "");
+    wxCommand(bool canUndoIt = FALSE, const wxString& name = wxT(""));

     ~wxCommand();
 
     // Override this to perform a command
     ~wxCommand();
 
     // Override this to perform a command


@@ -69,9 +71,18 @@ public:
     virtual bool CanUndo() const;
     virtual bool CanRedo() const;
 
     virtual bool CanUndo() const;
     virtual bool CanRedo() const;
 

+    // Initialises the current command and menu strings.

     virtual void Initialize();
     virtual void Initialize();

+
+    // Sets the Undo/Redo menu strings for the current menu.

     virtual void SetMenuStrings();
 
     virtual void SetMenuStrings();
 

+    // Gets the current Undo menu label.
+    wxString GetUndoMenuLabel() const;
+
+    // Gets the current Undo menu label.
+    wxString GetRedoMenuLabel() const;
+

 #if wxUSE_MENUS
     // Call this to manage an edit menu.
     void SetEditMenu(wxMenu *menu) { m_commandEditMenu = menu; }
 #if wxUSE_MENUS
     // Call this to manage an edit menu.
     void SetEditMenu(wxMenu *menu) { m_commandEditMenu = menu; }


@@ -82,7 +93,7 @@ public:
     wxList& GetCommands() const { return (wxList&) m_commands; }
     wxCommand *GetCurrentCommand() const
     {
     wxList& GetCommands() const { return (wxList&) m_commands; }
     wxCommand *GetCurrentCommand() const
     {

-        return (wxCommand *)(m_currentCommand ? m_currentCommand->Data() : NULL);
+        return (wxCommand *)(m_currentCommand ? m_currentCommand->GetData() : NULL);

     }
     int GetMaxCommands() const { return m_maxNoCommands; }
     virtual void ClearCommands();
     }
     int GetMaxCommands() const { return m_maxNoCommands; }
     virtual void ClearCommands();


@@ -114,6 +125,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxCommandProcessor)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxCommandProcessor)

+    DECLARE_NO_COPY_CLASS(wxCommandProcessor)

 };
 
 #endif // _WX_CMDPROC_H_
 };
 
 #endif // _WX_CMDPROC_H_