Change the C name of my wxGetApp so it doesn't conflict if wxPython is

linked statically with a C++ wxWidgets app.

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

diff --git a/wxPython/src/__core_rename.i b/wxPython/src/__core_rename.i
index f2a4a37716b6244cc387a59e89ce0a9230c6dfbb..e5a396a8f28be994adb50ca4964397fa5dbccf6a 100644 (file)
--- a/wxPython/src/__core_rename.i
+++ b/wxPython/src/__core_rename.i
@@ -574,7 +574,6 @@
 %rename(WakeUpIdle)                         wxWakeUpIdle;
 %rename(PostEvent)                          wxPostEvent;
 %rename(App_CleanUp)                        wxApp_CleanUp;
-%rename(GetApp)                             wxGetApp;
 %rename(AcceleratorEntry)                   wxAcceleratorEntry;
 %rename(AcceleratorTable)                   wxAcceleratorTable;
 %rename(NullAcceleratorTable)               wxNullAcceleratorTable;

diff --git a/wxPython/src/__core_reverse.txt b/wxPython/src/__core_reverse.txt
index 1e0b04cf77222036b5c34127deefb23a43b6a6d8..105ac008011c699a2b99a4a16573380f0456e337 100644 (file)
--- a/wxPython/src/__core_reverse.txt
+++ b/wxPython/src/__core_reverse.txt
@@ -2,6 +2,7 @@
 
 PyOnDemandOutputWindow
 App
+GetApp
 PySimpleApp
 PyWidgetTester
 

diff --git a/wxPython/src/_app.i b/wxPython/src/_app.i
index d28c88992cb22f441c665d59d77442c0806f0a07..fc25d1c8c1e79138f3e9139782349a887c243357 100644 (file)
--- a/wxPython/src/_app.i
+++ b/wxPython/src/_app.i
@@ -334,15 +334,16 @@ Python shuts down.", "");
 %} 
 
 
-DocStr(wxGetApp,
-       "Return a reference to the current wx.App object.", "");
-%inline %{
-    wxPyApp* wxGetApp() {
-        return (wxPyApp*)wxTheApp;
-    }
+DocDeclStrName(
+    wxPyApp* , wxPyGetApp(),
+    "Return a reference to the current wx.App object.", "",
+    GetApp);
+%{
+    wxPyApp* wxPyGetApp() { return (wxPyApp*)wxTheApp; }
 %}
 
 
+
 //---------------------------------------------------------------------------
 // Include some extra wxApp related python code here
 

diff --git a/wxPython/wxPython/_core.py b/wxPython/wxPython/_core.py
index c55b36055a403a20fbb2ab1181114ee26a819f3d..c9118d7558c3c1e908eab9db888003f79be888f2 100644 (file)
--- a/wxPython/wxPython/_core.py
+++ b/wxPython/wxPython/_core.py
@@ -1042,6 +1042,7 @@ wxLayoutConstraints = wx._core.LayoutConstraints
 wxLayoutConstraintsPtr = wx._core.LayoutConstraintsPtr
 wxPyOnDemandOutputWindow = wx._core.PyOnDemandOutputWindow
 wxApp = wx._core.App
+wxGetApp = wx._core.GetApp
 wxPySimpleApp = wx._core.PySimpleApp
 wxPyWidgetTester = wx._core.PyWidgetTester
 wxApp_GetMacSupportPCMenuShortcuts = wx._core.App_GetMacSupportPCMenuShortcuts