Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
linked statically with a C++ wxWidgets app.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-05-14 21:27:23 +00:00
parent c8fac2b60d
commit c92d92835d
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wxPython/src/__core_rename.i
View File

@@ -574,7 +574,6 @@
%rename(WakeUpIdle) wxWakeUpIdle; %rename(WakeUpIdle) wxWakeUpIdle;
%rename(PostEvent) wxPostEvent; %rename(PostEvent) wxPostEvent;
%rename(App_CleanUp) wxApp_CleanUp; %rename(App_CleanUp) wxApp_CleanUp;
%rename(GetApp) wxGetApp;
%rename(AcceleratorEntry) wxAcceleratorEntry; %rename(AcceleratorEntry) wxAcceleratorEntry;
%rename(AcceleratorTable) wxAcceleratorTable; %rename(AcceleratorTable) wxAcceleratorTable;
%rename(NullAcceleratorTable) wxNullAcceleratorTable; %rename(NullAcceleratorTable) wxNullAcceleratorTable;

1
wxPython/src/__core_reverse.txt
View File

@@ -2,6 +2,7 @@
PyOnDemandOutputWindow PyOnDemandOutputWindow
App App
GetApp
PySimpleApp PySimpleApp
PyWidgetTester PyWidgetTester

13
wxPython/src/_app.i
View File

@@ -334,15 +334,16 @@ Python shuts down.", "");
%} %}
DocStr(wxGetApp, DocDeclStrName(
"Return a reference to the current wx.App object.", ""); wxPyApp* , wxPyGetApp(),
%inline %{ "Return a reference to the current wx.App object.", "",
wxPyApp* wxGetApp() { GetApp);
return (wxPyApp*)wxTheApp; %{
} wxPyApp* wxPyGetApp() { return (wxPyApp*)wxTheApp; }
%} %}
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Include some extra wxApp related python code here // Include some extra wxApp related python code here

1
wxPython/wxPython/_core.py
View File

@@ -1042,6 +1042,7 @@ wxLayoutConstraints = wx._core.LayoutConstraints
wxLayoutConstraintsPtr = wx._core.LayoutConstraintsPtr wxLayoutConstraintsPtr = wx._core.LayoutConstraintsPtr
wxPyOnDemandOutputWindow = wx._core.PyOnDemandOutputWindow wxPyOnDemandOutputWindow = wx._core.PyOnDemandOutputWindow
wxApp = wx._core.App wxApp = wx._core.App
wxGetApp = wx._core.GetApp
wxPySimpleApp = wx._core.PySimpleApp wxPySimpleApp = wx._core.PySimpleApp
wxPyWidgetTester = wx._core.PyWidgetTester wxPyWidgetTester = wx._core.PyWidgetTester
wxApp_GetMacSupportPCMenuShortcuts = wx._core.App_GetMacSupportPCMenuShortcuts wxApp_GetMacSupportPCMenuShortcuts = wx._core.App_GetMacSupportPCMenuShortcuts