Factor the brush selection out of OnPaint so it can be overridden in

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

diff --git a/src/xrc/xh_datectrl.cpp b/src/xrc/xh_datectrl.cpp
index 5ab0fa49dc71f30c7382d70daf1027b8415b4ad1..f3e4de97fe77e7d5a8bc143dd02e6574a12780e8 100644 (file)
--- a/src/xrc/xh_datectrl.cpp
+++ b/src/xrc/xh_datectrl.cpp
@@ -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"
 


@@ -19,7 +15,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_XRC
+#if wxUSE_XRC && wxUSE_DATEPICKCTRL

 
 #include "wx/xrc/xh_datectrl.h"
 #include "wx/datectrl.h"
 
 #include "wx/xrc/xh_datectrl.h"
 #include "wx/datectrl.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();
 }


@@ -57,4 +54,4 @@ bool wxDateCtrlXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxDatePickerCtrl"));
 }
 
     return IsOfClass(node, wxT("wxDatePickerCtrl"));
 }
 

-#endif // wxUSE_XRC
+#endif // wxUSE_XRC && wxUSE_DATEPICKCTRL