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

Changes for removing DefaultEncodingIsPC

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-09-19 16:46:03 +00:00
parent 4326f7b7b2
commit 36a73f1d03
4 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wxPython/src/_extras.py
View File

@@ -992,13 +992,11 @@ of your Mac."""
# change from wxPyApp_ to wxApp_ # change from wxPyApp_ to wxApp_
wxApp_GetMacDefaultEncodingIsPC = wxc.wxPyApp_GetMacDefaultEncodingIsPC
wxApp_GetMacSupportPCMenuShortcuts = wxc.wxPyApp_GetMacSupportPCMenuShortcuts wxApp_GetMacSupportPCMenuShortcuts = wxc.wxPyApp_GetMacSupportPCMenuShortcuts
wxApp_GetMacAboutMenuItemId = wxc.wxPyApp_GetMacAboutMenuItemId wxApp_GetMacAboutMenuItemId = wxc.wxPyApp_GetMacAboutMenuItemId
wxApp_GetMacPreferencesMenuItemId = wxc.wxPyApp_GetMacPreferencesMenuItemId wxApp_GetMacPreferencesMenuItemId = wxc.wxPyApp_GetMacPreferencesMenuItemId
wxApp_GetMacExitMenuItemId = wxc.wxPyApp_GetMacExitMenuItemId wxApp_GetMacExitMenuItemId = wxc.wxPyApp_GetMacExitMenuItemId
wxApp_GetMacHelpMenuTitleName = wxc.wxPyApp_GetMacHelpMenuTitleName wxApp_GetMacHelpMenuTitleName = wxc.wxPyApp_GetMacHelpMenuTitleName
wxApp_SetMacDefaultEncodingIsPC = wxc.wxPyApp_SetMacDefaultEncodingIsPC
wxApp_SetMacSupportPCMenuShortcuts = wxc.wxPyApp_SetMacSupportPCMenuShortcuts wxApp_SetMacSupportPCMenuShortcuts = wxc.wxPyApp_SetMacSupportPCMenuShortcuts
wxApp_SetMacAboutMenuItemId = wxc.wxPyApp_SetMacAboutMenuItemId wxApp_SetMacAboutMenuItemId = wxc.wxPyApp_SetMacAboutMenuItemId
wxApp_SetMacPreferencesMenuItemId = wxc.wxPyApp_SetMacPreferencesMenuItemId wxApp_SetMacPreferencesMenuItemId = wxc.wxPyApp_SetMacPreferencesMenuItemId

20
wxPython/src/helpers.cpp
View File

@@ -228,15 +228,6 @@ void wxPyApp::OnAssert(const wxChar *file,
#endif #endif
/*static*/
bool wxPyApp::GetMacDefaultEncodingIsPC() {
#ifdef __WXMAC__
return s_macDefaultEncodingIsPC;
#else
return 0;
#endif
}
/*static*/ /*static*/
bool wxPyApp::GetMacSupportPCMenuShortcuts() { bool wxPyApp::GetMacSupportPCMenuShortcuts() {
#ifdef __WXMAC__ #ifdef __WXMAC__
@@ -282,13 +273,6 @@ wxString wxPyApp::GetMacHelpMenuTitleName() {
#endif #endif
} }
/*static*/
void wxPyApp::SetMacDefaultEncodingIsPC(bool val) {
#ifdef __WXMAC__
s_macDefaultEncodingIsPC = val;
#endif
}
/*static*/ /*static*/
void wxPyApp::SetMacSupportPCMenuShortcuts(bool val) { void wxPyApp::SetMacSupportPCMenuShortcuts(bool val) {
#ifdef __WXMAC__ #ifdef __WXMAC__
@@ -1689,6 +1673,10 @@ long wxPyGetWinHandle(wxWindow* win) {
return (long)win->GetHandle(); return (long)win->GetHandle();
#endif #endif
#ifdef __WXAC__
return (long)win->GetHandle();
#endif
// Find and return the actual X-Window. // Find and return the actual X-Window.
#ifdef __WXGTK__ #ifdef __WXGTK__
if (win->m_wxwindow) { if (win->m_wxwindow) {

2
wxPython/src/helpers.h
View File

@@ -459,14 +459,12 @@ public:
// virtual int FilterEvent(wxEvent& event); // This one too???? // virtual int FilterEvent(wxEvent& event); // This one too????
static bool GetMacDefaultEncodingIsPC();
static bool GetMacSupportPCMenuShortcuts(); static bool GetMacSupportPCMenuShortcuts();
static long GetMacAboutMenuItemId(); static long GetMacAboutMenuItemId();
static long GetMacPreferencesMenuItemId(); static long GetMacPreferencesMenuItemId();
static long GetMacExitMenuItemId(); static long GetMacExitMenuItemId();
static wxString GetMacHelpMenuTitleName(); static wxString GetMacHelpMenuTitleName();
static void SetMacDefaultEncodingIsPC(bool val);
static void SetMacSupportPCMenuShortcuts(bool val); static void SetMacSupportPCMenuShortcuts(bool val);
static void SetMacAboutMenuItemId(long val); static void SetMacAboutMenuItemId(long val);
static void SetMacPreferencesMenuItemId(long val); static void SetMacPreferencesMenuItemId(long val);

2
wxPython/src/wx.i
View File

@@ -114,14 +114,12 @@ public:
void SetAssertMode(int mode); void SetAssertMode(int mode);
static bool GetMacDefaultEncodingIsPC();
static bool GetMacSupportPCMenuShortcuts(); static bool GetMacSupportPCMenuShortcuts();
static long GetMacAboutMenuItemId(); static long GetMacAboutMenuItemId();
static long GetMacPreferencesMenuItemId(); static long GetMacPreferencesMenuItemId();
static long GetMacExitMenuItemId(); static long GetMacExitMenuItemId();
static wxString GetMacHelpMenuTitleName(); static wxString GetMacHelpMenuTitleName();
static void SetMacDefaultEncodingIsPC(bool val);
static void SetMacSupportPCMenuShortcuts(bool val); static void SetMacSupportPCMenuShortcuts(bool val);
static void SetMacAboutMenuItemId(long val); static void SetMacAboutMenuItemId(long val);
static void SetMacPreferencesMenuItemId(long val); static void SetMacPreferencesMenuItemId(long val);