From: Robin Dunn <robin@alldunn.com>
Date: Fri, 14 May 2004 21:27:23 +0000 (+0000)
Subject: Change the C name of my wxGetApp so it doesn't conflict if wxPython is
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c92d92835d428582eadc8c68f885577634d89413?ds=inline

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 f2a4a37716..e5a396a8f2 100644
--- 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 1e0b04cf77..105ac00801 100644
--- 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 d28c88992c..fc25d1c8c1 100644
--- 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 c55b36055a..c9118d7558 100644
--- 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