fixing osx_cocoa, there's a reason m_peer is private in the base class

[wxWidgets.git] / src / xrc / xh_datectrl.cpp

diff --git a/src/xrc/xh_datectrl.cpp b/src/xrc/xh_datectrl.cpp
index 36b31266bdb15f9dd2d8f1ae404b509b637845d4..4c0225b57fe7fa5a71447864c3f03f34c297406c 100644 (file)
--- a/src/xrc/xh_datectrl.cpp
+++ b/src/xrc/xh_datectrl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_datectrl.cpp
+// Name:        src/xrc/xh_datectrl.cpp

 // Purpose:     XML resource handler for wxDatePickerCtrl
 // Author:      Vaclav Slavik
 // Created:     2005-02-07
 // Purpose:     XML resource handler for wxDatePickerCtrl
 // Author:      Vaclav Slavik
 // Created:     2005-02-07


@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "xh_datectrl.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -31,6 +27,7 @@ wxDateCtrlXmlHandler::wxDateCtrlXmlHandler() : wxXmlResourceHandler()
     XRC_ADD_STYLE(wxDP_DEFAULT);
     XRC_ADD_STYLE(wxDP_SPIN);
     XRC_ADD_STYLE(wxDP_DROPDOWN);
     XRC_ADD_STYLE(wxDP_DEFAULT);
     XRC_ADD_STYLE(wxDP_SPIN);
     XRC_ADD_STYLE(wxDP_DROPDOWN);

+    XRC_ADD_STYLE(wxDP_ALLOWNONE);

     XRC_ADD_STYLE(wxDP_SHOWCENTURY);
     AddWindowStyles();
 }
     XRC_ADD_STYLE(wxDP_SHOWCENTURY);
     AddWindowStyles();
 }


@@ -43,7 +40,7 @@ wxObject *wxDateCtrlXmlHandler::DoCreateResource()
                   GetID(),
                   wxDefaultDateTime,
                   GetPosition(), GetSize(),
                   GetID(),
                   wxDefaultDateTime,
                   GetPosition(), GetSize(),

-                  GetStyle(_T("style"), wxDP_DEFAULT | wxDP_SHOWCENTURY),
+                  GetStyle(wxT("style"), wxDP_DEFAULT | wxDP_SHOWCENTURY),

                   wxDefaultValidator,
                   GetName());
 
                   wxDefaultValidator,
                   GetName());