Changes for removing DefaultEncodingIsPC

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

diff --git a/wxPython/src/_extras.py b/wxPython/src/_extras.py
index c8d56f488240a650e2d95913ed461afe8b8b3b61..7fdae3e4d2d28ad8691988345982e5d0e05b270c 100644 (file)
--- a/wxPython/src/_extras.py
+++ b/wxPython/src/_extras.py
@@ -992,13 +992,11 @@ of your Mac."""
 
 
 # change from wxPyApp_ to wxApp_
-wxApp_GetMacDefaultEncodingIsPC = wxc.wxPyApp_GetMacDefaultEncodingIsPC
 wxApp_GetMacSupportPCMenuShortcuts = wxc.wxPyApp_GetMacSupportPCMenuShortcuts
 wxApp_GetMacAboutMenuItemId = wxc.wxPyApp_GetMacAboutMenuItemId
 wxApp_GetMacPreferencesMenuItemId = wxc.wxPyApp_GetMacPreferencesMenuItemId
 wxApp_GetMacExitMenuItemId = wxc.wxPyApp_GetMacExitMenuItemId
 wxApp_GetMacHelpMenuTitleName = wxc.wxPyApp_GetMacHelpMenuTitleName
-wxApp_SetMacDefaultEncodingIsPC = wxc.wxPyApp_SetMacDefaultEncodingIsPC
 wxApp_SetMacSupportPCMenuShortcuts = wxc.wxPyApp_SetMacSupportPCMenuShortcuts
 wxApp_SetMacAboutMenuItemId = wxc.wxPyApp_SetMacAboutMenuItemId
 wxApp_SetMacPreferencesMenuItemId = wxc.wxPyApp_SetMacPreferencesMenuItemId

diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp
index 57b971ae57ad73e7bd8d21bfd0b22cd2bf78d6fe..1e7a62009d394ce5bd2405121a98b4e7b38c5e4f 100644 (file)
--- a/wxPython/src/helpers.cpp
+++ b/wxPython/src/helpers.cpp
@@ -228,15 +228,6 @@ void wxPyApp::OnAssert(const wxChar *file,
 #endif
 
 
-/*static*/
-bool wxPyApp::GetMacDefaultEncodingIsPC() {
-#ifdef __WXMAC__
-    return s_macDefaultEncodingIsPC;
-#else
-    return 0;
-#endif
-}
-
 /*static*/
 bool wxPyApp::GetMacSupportPCMenuShortcuts() {
 #ifdef __WXMAC__
@@ -282,13 +273,6 @@ wxString wxPyApp::GetMacHelpMenuTitleName() {
 #endif
 }
 
-/*static*/
-void wxPyApp::SetMacDefaultEncodingIsPC(bool val) {
-#ifdef __WXMAC__
-    s_macDefaultEncodingIsPC = val;
-#endif
-}
-
 /*static*/
 void wxPyApp::SetMacSupportPCMenuShortcuts(bool val) {
 #ifdef __WXMAC__
@@ -1689,6 +1673,10 @@ long wxPyGetWinHandle(wxWindow* win) {
     return (long)win->GetHandle();
 #endif
 
+#ifdef __WXAC__
+    return (long)win->GetHandle();
+#endif
+
     // Find and return the actual X-Window.
 #ifdef __WXGTK__
     if (win->m_wxwindow) {

diff --git a/wxPython/src/helpers.h b/wxPython/src/helpers.h
index 17c73fae138daa5457d2c998a096b24223cf97bf..69ee25816ec40f79dc952ee0d0f7898fb9d2d9c0 100644 (file)
--- a/wxPython/src/helpers.h
+++ b/wxPython/src/helpers.h
@@ -459,14 +459,12 @@ public:
     // virtual int FilterEvent(wxEvent& event); // This one too????
 
 
-    static bool GetMacDefaultEncodingIsPC();
     static bool GetMacSupportPCMenuShortcuts();
     static long GetMacAboutMenuItemId();
     static long GetMacPreferencesMenuItemId();
     static long GetMacExitMenuItemId();
     static wxString GetMacHelpMenuTitleName();
 
-    static void SetMacDefaultEncodingIsPC(bool val);
     static void SetMacSupportPCMenuShortcuts(bool val);
     static void SetMacAboutMenuItemId(long val);
     static void SetMacPreferencesMenuItemId(long val);

diff --git a/wxPython/src/wx.i b/wxPython/src/wx.i
index 4f05180037fbef09aa12e802026e3ba260187a0b..924db3985a8b658a8f929f495e2e8055c054820c 100644 (file)
--- a/wxPython/src/wx.i
+++ b/wxPython/src/wx.i
@@ -114,14 +114,12 @@ public:
     void SetAssertMode(int mode);
 
 
-    static bool GetMacDefaultEncodingIsPC();
     static bool GetMacSupportPCMenuShortcuts();
     static long GetMacAboutMenuItemId();
     static long GetMacPreferencesMenuItemId();
     static long GetMacExitMenuItemId();
     static wxString GetMacHelpMenuTitleName();
 
-    static void SetMacDefaultEncodingIsPC(bool val);
     static void SetMacSupportPCMenuShortcuts(bool val);
     static void SetMacAboutMenuItemId(long val);
     static void SetMacPreferencesMenuItemId(long val);