reSWIGged

[wxWidgets.git] / wxPython / src / helpers.cpp

diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp
index 74e229aa8112d4c94eb50e488ab0e8b84d405fef..e71d858d5b7ccd75a638fc762a66642c39d45d53 100644 (file)
--- a/wxPython/src/helpers.cpp
+++ b/wxPython/src/helpers.cpp
@@ -115,9 +115,6 @@ int  wxPyApp::MainLoop() {
 
     DeletePendingObjects();
     bool initialized = wxTopLevelWindows.GetCount() != 0;
 
     DeletePendingObjects();
     bool initialized = wxTopLevelWindows.GetCount() != 0;

-#ifdef __WXGTK__
-    m_initialized = initialized;
-#endif

 
     if (initialized) {
         if ( m_exitOnFrameDelete == Later ) {
 
     if (initialized) {
         if ( m_exitOnFrameDelete == Later ) {


@@ -228,15 +225,6 @@ void wxPyApp::OnAssert(const wxChar *file,
 #endif
 
 
 #endif
 
 

-/*static*/
-bool wxPyApp::GetMacDefaultEncodingIsPC() {
-#ifdef __WXMAC__
-    return s_macDefaultEncodingIsPC;
-#else
-    return 0;
-#endif
-}
-

 /*static*/
 bool wxPyApp::GetMacSupportPCMenuShortcuts() {
 #ifdef __WXMAC__
 /*static*/
 bool wxPyApp::GetMacSupportPCMenuShortcuts() {
 #ifdef __WXMAC__


@@ -282,13 +270,6 @@ wxString wxPyApp::GetMacHelpMenuTitleName() {
 #endif
 }
 
 #endif
 }
 

-/*static*/
-void wxPyApp::SetMacDefaultEncodingIsPC(bool val) {
-#ifdef __WXMAC__
-    s_macDefaultEncodingIsPC = val;
-#endif
-}
-

 /*static*/
 void wxPyApp::SetMacSupportPCMenuShortcuts(bool val) {
 #ifdef __WXMAC__
 /*static*/
 void wxPyApp::SetMacSupportPCMenuShortcuts(bool val) {
 #ifdef __WXMAC__


@@ -384,7 +365,7 @@ void __wxPreStart(PyObject* moduleDict)
 #endif
 
     // Ensure that the build options in the DLL (or whatever) match this build
 #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",
 
     // Create an exception object to use for wxASSERTions
     wxPyAssertionError = PyErr_NewException("wxPython.wxc.wxPyAssertionError",


@@ -455,10 +436,6 @@ PyObject* __wxStart(PyObject* /* self */, PyObject* args)
         goto error;
     }
 
         goto error;
     }
 

-#ifdef __WXGTK__
-    wxTheApp->m_initialized = (wxTopLevelWindows.GetCount() > 0);
-#endif
-

     Py_DECREF(result);
     Py_DECREF(pyint);
     Py_INCREF(Py_None);
     Py_DECREF(result);
     Py_DECREF(pyint);
     Py_INCREF(Py_None);


@@ -1689,6 +1666,10 @@ long wxPyGetWinHandle(wxWindow* win) {
     return (long)win->GetHandle();
 #endif
 
     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) {
     // Find and return the actual X-Window.
 #ifdef __WXGTK__
     if (win->m_wxwindow) {