compilation error fix (trailing comma in an enum)

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

diff --git a/wxPython/src/calendar.i b/wxPython/src/calendar.i
index 0acbdd652db6e47ebf5528df42363bf5f582a3e5..96add9859bfe0f143f62c8925d60cb38f10b77a9 100644 (file)
--- a/wxPython/src/calendar.i
+++ b/wxPython/src/calendar.i
@@ -14,7 +14,7 @@
 
 
 %{
 
 
 %{

-#include "export.h"
+#include "wxPython.h"

 #include <wx/calctrl.h>
 %}
 
 #include <wx/calctrl.h>
 %}
 


@@ -151,6 +151,11 @@ def EVT_CALENDAR_WEEKDAY_CLICKED(win, id, fn):
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+%{
+    // Put some wx default wxChar* values into wxStrings.
+    DECLARE_DEF_STRING(CalendarNameStr);
+%}
+

 class wxCalendarCtrl : public wxControl
 {
 public:
 class wxCalendarCtrl : public wxControl
 {
 public:


@@ -161,7 +166,7 @@ public:
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = wxCAL_SHOW_HOLIDAYS | wxWANTS_CHARS,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = wxCAL_SHOW_HOLIDAYS | wxWANTS_CHARS,

-                   const char* name = "calendar");
+                   const wxString& name = wxPyCalendarNameStr);

     %name(wxPreCalendarCtrl)wxCalendarCtrl();
 
     bool Create(wxWindow *parent,
     %name(wxPreCalendarCtrl)wxCalendarCtrl();
 
     bool Create(wxWindow *parent,


@@ -170,7 +175,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxCAL_SHOW_HOLIDAYS | wxWANTS_CHARS,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxCAL_SHOW_HOLIDAYS | wxWANTS_CHARS,

-                const char* name = "calendar");
+                const wxString& name = wxPyCalendarNameStr);

 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
     %pragma(python) addtomethod = "wxPreCalendarCtrl:val._setOORInfo(val)"
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
     %pragma(python) addtomethod = "wxPreCalendarCtrl:val._setOORInfo(val)"