Fixed compile errors, warnings and other DSMs, and improved comments.

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

diff --git a/wxPython/src/calendar.i b/wxPython/src/calendar.i
index 73fc6bd66a1f35420eb597d4b4a4e22d7189be86..91369950d2f4dffc75f3e0d636a19044c0ad7e56 100644 (file)
--- a/wxPython/src/calendar.i
+++ b/wxPython/src/calendar.i
@@ -14,7 +14,7 @@
 
 
 %{
 
 
 %{

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

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


@@ -155,8 +155,17 @@ public:
                    const wxDateTime& date = wxDefaultDateTime,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    const wxDateTime& date = wxDefaultDateTime,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,

-                   long style = wxCAL_SHOW_HOLIDAYS,
+                   long style = wxCAL_SHOW_HOLIDAYS | wxWANTS_CHARS,

                    const char* name = "calendar");
                    const char* name = "calendar");

+    %name(wxPreCalendarCtrl)wxCalendarCtrl();
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxDateTime& date = wxDefaultDateTime,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxCAL_SHOW_HOLIDAYS | wxWANTS_CHARS,
+                const char* name = "calendar");

 
     // set/get the current date
     // ------------------------
 
     // set/get the current date
     // ------------------------


@@ -223,6 +232,12 @@ public:
 
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------

+
+%init %{
+    wxClassInfo::CleanUpClasses();
+    wxClassInfo::InitializeClasses();
+%}
+

 //---------------------------------------------------------------------------
 
 %pragma(python) include="_calextras.py";
 //---------------------------------------------------------------------------
 
 %pragma(python) include="_calextras.py";