s_macSupportPCMenuShortcuts no longer exists

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

diff --git a/wxPython/src/_app.i b/wxPython/src/_app.i
index 780754c0c35ecd7fcfbe365b645726751cdddbfc..4c7ff5f139307c017e1c6b4518da9fa2309cbc18 100644 (file)
--- a/wxPython/src/_app.i
+++ b/wxPython/src/_app.i
@@ -267,13 +267,13 @@ systems where more than one is available, (Sun, SGI, XFree86 4, etc.)", "");
         "Get the current OnAssert behaviour setting.", "");
 
 
         "Get the current OnAssert behaviour setting.", "");
 
 

-    static bool GetMacSupportPCMenuShortcuts();
+    static bool GetMacSupportPCMenuShortcuts();  // TODO, deprecate this

     static long GetMacAboutMenuItemId();
     static long GetMacPreferencesMenuItemId();
     static long GetMacExitMenuItemId();
     static wxString GetMacHelpMenuTitleName();
 
     static long GetMacAboutMenuItemId();
     static long GetMacPreferencesMenuItemId();
     static long GetMacExitMenuItemId();
     static wxString GetMacHelpMenuTitleName();
 

-    static void SetMacSupportPCMenuShortcuts(bool val);
+    static void SetMacSupportPCMenuShortcuts(bool val);  // TODO, deprecate this

     static void SetMacAboutMenuItemId(long val);
     static void SetMacPreferencesMenuItemId(long val);
     static void SetMacExitMenuItemId(long val);
     static void SetMacAboutMenuItemId(long val);
     static void SetMacPreferencesMenuItemId(long val);
     static void SetMacExitMenuItemId(long val);

diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp
index e7326368cee096856ab8e8d754960ce2185c9231..eee5e107f69ae043878fdcba967027b7420fa710 100644 (file)
--- a/wxPython/src/helpers.cpp
+++ b/wxPython/src/helpers.cpp
@@ -323,11 +323,7 @@ void wxPyApp::MacReopenApp()
 
 /*static*/
 bool wxPyApp::GetMacSupportPCMenuShortcuts() {
 
 /*static*/
 bool wxPyApp::GetMacSupportPCMenuShortcuts() {

-#ifdef __WXMAC__
-    return s_macSupportPCMenuShortcuts;
-#else

     return 0;
     return 0;

-#endif

 }
 
 /*static*/
 }
 
 /*static*/


@@ -367,10 +363,7 @@ wxString wxPyApp::GetMacHelpMenuTitleName() {
 }
 
 /*static*/
 }
 
 /*static*/

-void wxPyApp::SetMacSupportPCMenuShortcuts(bool val) {
-#ifdef __WXMAC__
-    s_macSupportPCMenuShortcuts = val;
-#endif
+void wxPyApp::SetMacSupportPCMenuShortcuts(bool) {

 }
 
 /*static*/
 }
 
 /*static*/