some ifdef'd out things added back in

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/wxPython/src/windows.i b/utils/wxPython/src/windows.i
index 1a8ef667e51d3b6d8e670c74b3e5d0c333c666e8..d4eb2844d4f3850fd4a694269967019350c9d67a 100644 (file)
--- a/utils/wxPython/src/windows.i
+++ b/utils/wxPython/src/windows.i
@@ -336,9 +336,7 @@ public:
                 int checkable = FALSE);
     %name(AppendMenu)void Append(int id, const wxString& item, wxMenu *subMenu,
                 const wxString& helpString = wxPyEmptyStr);
                 int checkable = FALSE);
     %name(AppendMenu)void Append(int id, const wxString& item, wxMenu *subMenu,
                 const wxString& helpString = wxPyEmptyStr);

-#ifndef __WXGTK__

     %name(AppendItem)void Append(const wxMenuItem* item);
     %name(AppendItem)void Append(const wxMenuItem* item);

-#endif

 
     void AppendSeparator();
     void Break();
 
     void AppendSeparator();
     void Break();


@@ -389,15 +387,13 @@ public:
     bool Enabled(int id);
     int FindMenuItem(const wxString& menuString, const wxString& itemString);
     wxMenuItem * FindItemForId(int id);
     bool Enabled(int id);
     int FindMenuItem(const wxString& menuString, const wxString& itemString);
     wxMenuItem * FindItemForId(int id);

-#ifdef __WXMSW__
+    void SetLabel(int id, const wxString& label);

     void EnableTop(int pos, bool enable);
     wxString GetHelpString(int id);
     wxString GetLabel(int id);
     void SetHelpString(int id, const wxString& helpString);
     void EnableTop(int pos, bool enable);
     wxString GetHelpString(int id);
     wxString GetLabel(int id);
     void SetHelpString(int id, const wxString& helpString);

-    void SetLabel(int id, const wxString& label);

     wxString GetLabelTop(int pos);
     void SetLabelTop(int pos, const wxString& label);
     wxString GetLabelTop(int pos);
     void SetLabelTop(int pos, const wxString& label);

-#endif

     int GetMenuCount();
     wxMenu* GetMenu(int i);
 };
     int GetMenuCount();
     wxMenu* GetMenu(int i);
 };