X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3734a866308a124c9ad924b331913de0d616c36f..014c5a64b57bc8769e667614854e3dd4491a470b:/wxPython/src/helpers.cpp diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp index 74e229aa81..1e7a62009d 100644 --- 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__ @@ -384,7 +368,7 @@ void __wxPreStart(PyObject* moduleDict) #endif // Ensure that the build options in the DLL (or whatever) match this build - wxApp::CheckBuildOptions(wxBuildOptions()); + wxApp::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, "wxPython"); // Create an exception object to use for wxASSERTions wxPyAssertionError = PyErr_NewException("wxPython.wxc.wxPyAssertionError", @@ -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) {