compilation error fix (trailing comma in an enum)

[wxWidgets.git] / wxPython / src / misc2.i

diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i
index ef93904448eec59341075aafa4a646739f16bbcc..22a8d2d7b7cce589e4692b433247b0e5a359611b 100644 (file)
--- a/wxPython/src/misc2.i
+++ b/wxPython/src/misc2.i
@@ -563,6 +563,27 @@ enum
     wxLOG_User = 100  // user defined levels start here
 };
 
+#define wxTRACE_MemAlloc "memalloc" // trace memory allocation (new/delete)
+#define wxTRACE_Messages "messages" // trace window messages/X callbacks
+#define wxTRACE_ResAlloc "resalloc" // trace GDI resource allocation
+#define wxTRACE_RefCount "refcount" // trace various ref counting operations
+
+#ifdef  __WXMSW__
+#define wxTRACE_OleCalls "ole"      // OLE interface calls
+#endif
+
+enum {
+    wxTraceMemAlloc,
+    wxTraceMessages,
+    wxTraceResAlloc,
+    wxTraceRefCount,
+
+#ifdef  __WXMSW__
+    wxTraceOleCalls,
+#endif
+};
+
+
 
 class wxLog
 {
@@ -571,7 +592,7 @@ public:
 
     static bool IsEnabled();
     static bool EnableLogging(bool doIt = TRUE);
-    static void OnLog(wxLogLevel level, const wxString& szString, int t=0);
+    static void OnLog(unsigned long level, const wxString& szString, int t=0);
 
     virtual void Flush();
     bool HasPendingMessages() const;
@@ -586,7 +607,7 @@ public:
     static void SetVerbose(bool bVerbose = TRUE);
 
     static void DontCreateOnDemand();
-    static void SetTraceMask(wxTraceMask ulMask);
+    static void SetTraceMask(long ulMask);
     static void AddTraceMask(const wxString& str);
     static void RemoveTraceMask(const wxString& str);
     static void ClearTraceMasks();
@@ -596,7 +617,7 @@ public:
 
     bool GetVerbose() const;
 
-    static wxTraceMask GetTraceMask();
+    static unsigned long GetTraceMask();
     static bool IsAllowedTraceMask(const wxString& mask);
 
     // static void TimeStamp(wxString *str);
@@ -660,15 +681,20 @@ public:
 
 unsigned long wxSysErrorCode();
 const wxString wxSysErrorMsg(unsigned long nErrCode = 0);
-void wxLogFatalError(const wxString& szFormat);
-void wxLogError(const wxString& szFormat);
-void wxLogWarning(const wxString& szFormat);
-void wxLogMessage(const wxString& szFormat);
-void wxLogInfo(const wxString& szFormat);
-void wxLogVerbose(const wxString& szFormat);
-void wxLogStatus(const wxString& szFormat);
-%name(wxLogStatusFrame)void wxLogStatus(wxFrame *pFrame, const wxString& szFormat);
-void wxLogSysError(const wxString& szFormat);
+void wxLogFatalError(const wxString& msg);
+void wxLogError(const wxString& msg);
+void wxLogWarning(const wxString& msg);
+void wxLogMessage(const wxString& msg);
+void wxLogInfo(const wxString& msg);
+void wxLogVerbose(const wxString& msg);
+void wxLogStatus(const wxString& msg);
+%name(wxLogStatusFrame)void wxLogStatus(wxFrame *pFrame, const wxString& msg);
+void wxLogSysError(const wxString& msg);
+
+void wxLogTrace(const wxString& msg);
+%name(wxLogTraceMask)void wxLogTrace(const wxString& mask, const wxString& msg);
+
+void wxLogGeneric(unsigned long level, const wxString& msg);
 
 // wxLogFatalError helper: show the (fatal) error to the user in a safe way,
 // i.e. without using wxMessageBox() for example because it could crash
@@ -818,6 +844,25 @@ long wxExecute(const wxString& command,
 
 //----------------------------------------------------------------------
 
+
+// Which joystick? Same as Windows ids so no conversion necessary.
+enum
+{
+    wxJOYSTICK1,
+    wxJOYSTICK2
+};
+
+// Which button is down?
+enum
+{
+    wxJOY_BUTTON_ANY,
+    wxJOY_BUTTON1,
+    wxJOY_BUTTON2,
+    wxJOY_BUTTON3,
+    wxJOY_BUTTON4,
+};
+
+
 %{
 #if !wxUSE_JOYSTICK && !defined(__WXMSW__)
 // A C++ stub class for wxJoystick for platforms that don't have it.
@@ -1512,11 +1557,24 @@ public:
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 
+// %{
+// #if wxUSE_UNICODE
+// #define ADD_STRING(dict, str) \
+//     wxString tmp##str(str); \
+//     PyDict_SetItemString(dict, #str, \
+//                          PyUnicode_FromUnicode(tmp##str.c_str(), tmp##str.Len()))
+// #else
+// #define ADD_STRING(dict, str) \
+//     PyDict_SetItemString(d, #str, PyString_FromString(str))
+// #endif
+// %}
+
 
 %init %{
     wxPyPtrTypeMap_Add("wxDragImage", "wxGenericDragImage");
     wxPyPtrTypeMap_Add("wxProcess", "wxPyProcess");
     wxPyPtrTypeMap_Add("wxArtProvider", "wxPyArtProvider");
+
 %}
 
 //----------------------------------------------------------------------