Build fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/datectlg.cpp b/src/generic/datectlg.cpp
index 8a1c2bcf2ee02fb22df5707611a66015f6083a86..40528bb2f37d023b5e75ca04f6e60e734750985b 100644 (file)
--- a/src/generic/datectlg.cpp
+++ b/src/generic/datectlg.cpp
@@ -194,7 +194,7 @@ void wxDropdownButton::DoMoveWindow(int x, int y, int w, int h)
 
         wxRect r(0,0,bw, bh);
         wxRendererNative& renderer = wxRendererNative::Get();
 
         wxRect r(0,0,bw, bh);
         wxRendererNative& renderer = wxRendererNative::Get();

-        
+

 #ifdef __WXGTK__
         wxColour magic(255,0,255);
         dc.SetBrush( wxBrush( magic ) );
 #ifdef __WXGTK__
         wxColour magic(255,0,255);
         dc.SetBrush( wxBrush( magic ) );


@@ -210,7 +210,7 @@ void wxDropdownButton::DoMoveWindow(int x, int y, int w, int h)
 
         wxBitmap bmpSel(bw, bh);
         dc.SelectObject(bmpSel);
 
         wxBitmap bmpSel(bw, bh);
         dc.SelectObject(bmpSel);

-        
+

 #ifdef __WXGTK__
         dc.SetBrush( wxBrush( magic ) );
         dc.SetPen( *wxTRANSPARENT_PEN );
 #ifdef __WXGTK__
         dc.SetBrush( wxBrush( magic ) );
         dc.SetPen( *wxTRANSPARENT_PEN );


@@ -220,7 +220,7 @@ void wxDropdownButton::DoMoveWindow(int x, int y, int w, int h)
         bmpSel.SetMask( mask );
 #else
         renderer.DrawComboBoxDropButton(this, dc, r, wxCONTROL_PRESSED);
         bmpSel.SetMask( mask );
 #else
         renderer.DrawComboBoxDropButton(this, dc, r, wxCONTROL_PRESSED);

-#endif        
+#endif

         SetBitmapSelected(bmpSel);
     }
 
         SetBitmapSelected(bmpSel);
     }
 


@@ -567,10 +567,11 @@ bool wxDatePickerCtrlGeneric::SetFormat(const wxChar *fmt)
                 allowedChars.Add(wxString(*p++, 1));
         }
 
                 allowedChars.Add(wxString(*p++, 1));
         }
 

+#if wxUSE_VALIDATORS

         wxTextValidator tv(wxFILTER_INCLUDE_CHAR_LIST);
         tv.SetIncludes(allowedChars);
         wxTextValidator tv(wxFILTER_INCLUDE_CHAR_LIST);
         tv.SetIncludes(allowedChars);

-

         m_txt->SetValidator(tv);
         m_txt->SetValidator(tv);

+#endif

 
         if (m_currentDate.IsValid())
             m_txt->SetValue(m_currentDate.Format(m_format));
 
         if (m_currentDate.IsValid())
             m_txt->SetValue(m_currentDate.Format(m_format));

diff --git a/src/generic/dbgrptg.cpp b/src/generic/dbgrptg.cpp
index c09e021cd73f659ff43b29eff22af13ec5eb64ab..8a5b73ce39bee6a90ebc50e796e2e082dc261156 100644 (file)
--- a/src/generic/dbgrptg.cpp
+++ b/src/generic/dbgrptg.cpp
@@ -168,9 +168,11 @@ wxDumpOpenExternalDlg::wxDumpOpenExternalDlg(wxWindow *parent,
                                 wxID_ANY,
                                 wxEmptyString,
                                 wxDefaultPosition,
                                 wxID_ANY,
                                 wxEmptyString,
                                 wxDefaultPosition,

-                                wxSize(250, -1),
-                                0,
-                                wxTextValidator(wxFILTER_NONE, &m_command)
+                                wxSize(250, wxDefaultCoord),
+                                0
+#if wxUSE_VALIDATORS
+                                ,wxTextValidator(wxFILTER_NONE, &m_command)
+#endif

                               );
     sizerH->Add(command,
                     wxSizerFlags(1).Align(wxALIGN_CENTER_VERTICAL));
                               );
     sizerH->Add(command,
                     wxSizerFlags(1).Align(wxALIGN_CENTER_VERTICAL));

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index e6b3a70c0753a95d816ac5ca93874bc8509a888e..ee141260eca57634f20232e296685cd7db9a22e0 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -170,7 +170,7 @@ struct wxColWidthInfo
     }
 };
 
     }
 };
 

-WX_DEFINE_ARRAY(wxColWidthInfo *, ColWidthArray);
+WX_DEFINE_ARRAY_PTR(wxColWidthInfo *, ColWidthArray);

 
 //-----------------------------------------------------------------------------
 //  wxListItemData (internal)
 
 //-----------------------------------------------------------------------------
 //  wxListItemData (internal)


@@ -4501,9 +4501,7 @@ void wxListMainWindow::InsertItem( wxListItem &item )
 
         // calculate the width of the item and adjust the max column width
         wxColWidthInfo *pWidthInfo = m_aColWidths.Item(item.GetColumn());
 
         // calculate the width of the item and adjust the max column width
         wxColWidthInfo *pWidthInfo = m_aColWidths.Item(item.GetColumn());

-        int width = 0;
-
-        width = GetItemWidthWithImage(&item);
+        int width = GetItemWidthWithImage(&item);

         item.SetWidth(width);
         if (width > pWidthInfo->nMaxWidth)
             pWidthInfo->nMaxWidth = width;
         item.SetWidth(width);
         if (width > pWidthInfo->nMaxWidth)
             pWidthInfo->nMaxWidth = width;