Save the initial tstate during initialization

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

diff --git a/wxPython/src/helpers.h b/wxPython/src/helpers.h
index 449ed322196703fccc59ae728cca207d36f415a4..55f28dbc7c0db4e4f6c50bc3e0fa082be3f635d1 100644 (file)
--- a/wxPython/src/helpers.h
+++ b/wxPython/src/helpers.h
@@ -16,6 +16,10 @@
 #include <wx/wx.h>
 #include <wx/geometry.h>
 
 #include <wx/wx.h>
 #include <wx/geometry.h>
 

+//---------------------------------------------------------------------------
+#ifdef __WXMAC__  // avoid a bug in Carbon headers
+#define scalb scalbn
+#endif

 //---------------------------------------------------------------------------
 
 typedef unsigned char byte;
 //---------------------------------------------------------------------------
 
 typedef unsigned char byte;


@@ -459,14 +463,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 long GetMacAboutMenuItemId();
     static long GetMacPreferencesMenuItemId();
     static long GetMacExitMenuItemId();
     static wxString GetMacHelpMenuTitleName();
 
     static bool GetMacSupportPCMenuShortcuts();
     static long GetMacAboutMenuItemId();
     static long GetMacPreferencesMenuItemId();
     static long GetMacExitMenuItemId();
     static wxString GetMacHelpMenuTitleName();
 

-    static void SetMacDefaultEncodingIsPC(bool val);

     static void SetMacSupportPCMenuShortcuts(bool val);
     static void SetMacAboutMenuItemId(long val);
     static void SetMacPreferencesMenuItemId(long val);
     static void SetMacSupportPCMenuShortcuts(bool val);
     static void SetMacAboutMenuItemId(long val);
     static void SetMacPreferencesMenuItemId(long val);


@@ -2114,7 +2116,6 @@ extern wxPyApp *wxPythonApp;
         bool found;                                                             \
         wxPyBeginBlockThreads();                                                \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
         bool found;                                                             \
         wxPyBeginBlockThreads();                                                \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \

-            PyObject* ro;                                                       \

             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a));     \
         }                                                                       \
         wxPyEndBlockThreads();                                                  \
             rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a));     \
         }                                                                       \
         wxPyEndBlockThreads();                                                  \