Remove semicolon after if statmce that can potentially cause harm later. Patch #14438...

[wxWidgets.git] / src / generic / datectlg.cpp

diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index 299aec46f77c0f470a5d63ed81429a1b79752177..abcbacf408253df9f8b7a3f98c49b1700183ee3b 100644 (file)
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -29,7 +29,8 @@
 
 // use this version if we're explicitly requested to do it or if it's the only
 // one we have
 
 // use this version if we're explicitly requested to do it or if it's the only
 // one we have

-#if wxUSE_DATEPICKCTRL_GENERIC || !defined(wxHAS_NATIVE_DATEPICKCTRL)
+#if !defined(wxHAS_NATIVE_DATEPICKCTRL) || \
+        (defined(wxUSE_DATEPICKCTRL_GENERIC) && wxUSE_DATEPICKCTRL_GENERIC)

 
 #ifndef WX_PRECOMP
     #include "wx/bmpbuttn.h"
 
 #ifndef WX_PRECOMP
     #include "wx/bmpbuttn.h"


@@ -127,9 +128,8 @@ public:
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator);
 
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator);
 

-    virtual void DoMoveWindow(int x, int y, int w, int h);
-

 protected:
 protected:

+    virtual void DoMoveWindow(int x, int y, int w, int h);

 
     void OnSize(wxSizeEvent& event);
     void OnMouseEnter(wxMouseEvent& event);
 
     void OnSize(wxSizeEvent& event);
     void OnMouseEnter(wxMouseEvent& event);


@@ -632,14 +632,14 @@ wxDatePickerCtrlGeneric::SetDateRange(const wxDateTime& lowerdate,
 
 bool wxDatePickerCtrlGeneric::SetFormat(const wxChar *fmt)
 {
 
 bool wxDatePickerCtrlGeneric::SetFormat(const wxChar *fmt)
 {

+    m_format.clear();
+

     wxDateTime dt;
     dt.ParseFormat(wxT("2003-10-13"), wxT("%Y-%m-%d"));
     wxDateTime dt;
     dt.ParseFormat(wxT("2003-10-13"), wxT("%Y-%m-%d"));

-    wxString str=dt.Format(fmt);
-    wxChar *p=(wxChar*)str.c_str();
-
-    m_format=wxEmptyString;
+    wxString str(dt.Format(fmt));

 
 

-    while (*p)
+    const wxChar *p = str.c_str();
+    while ( *p )

     {
         int n=wxAtoi(p);
         if (n == dt.GetDay())
     {
         int n=wxAtoi(p);
         if (n == dt.GetDay())


@@ -669,19 +669,19 @@ bool wxDatePickerCtrlGeneric::SetFormat(const wxChar *fmt)
             m_format.Append(*p++);
     }
 
             m_format.Append(*p++);
     }
 

-    if (m_txt)
+    if ( m_txt )

     {
         wxArrayString allowedChars;
         for ( wxChar c = _T('0'); c <= _T('9'); c++ )
             allowedChars.Add(wxString(c, 1));
 
     {
         wxArrayString allowedChars;
         for ( wxChar c = _T('0'); c <= _T('9'); c++ )
             allowedChars.Add(wxString(c, 1));
 

-        const wxChar *p = m_format.c_str();
-        while (*p)
+        const wxChar *p2 = m_format.c_str();
+        while ( *p2 )

         {
         {

-            if (*p == '%')
-                p += 2;
+            if ( *p2 == '%')
+                p2 += 2;

             else
             else

-                allowedChars.Add(wxString(*p++, 1));
+                allowedChars.Add(wxString(*p2++, 1));

         }
 
 #if wxUSE_VALIDATORS
         }
 
 #if wxUSE_VALIDATORS