Miscellaneous compilation and warning fixes.

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

diff --git a/contrib/src/mmedia/sndwav.cpp b/contrib/src/mmedia/sndwav.cpp
index 793d6cb6e6d4af2481fae82485b5c446651ddcf7..c854f774efdd369f6a117cdfd84ba09e8391ff5c 100644 (file)
--- a/contrib/src/mmedia/sndwav.cpp
+++ b/contrib/src/mmedia/sndwav.cpp
@@ -373,7 +373,7 @@ FAIL_WITH(s->Write(&signature, 4).LastWrite() != 4, wxSOUND_INVSTRM);
         delete frmt;
     }
     
         delete frmt;
     }
     

-    data << (fmt_data.GetSize() + m_sndformat->GetBytesFromTime(time));
+    data << (wxUint32)(fmt_data.GetSize() + m_sndformat->GetBytesFromTime(time));

 
     // We, finally, copy the header block to the output stream 
     {
 
     // We, finally, copy the header block to the output stream 
     {

diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index 49d5721127d1596ddc21fe0adebc58fcb0bca28b..382148a1cadb44d38816fd946d0eeca31b1c635b 100644 (file)
--- a/samples/console/console.cpp
+++ b/samples/console/console.cpp
@@ -4403,7 +4403,9 @@ int main(int argc, char **argv)
 #endif
 
 #ifdef TEST_STACKWALKER
 #endif
 
 #ifdef TEST_STACKWALKER

+#if wxUSE_STACKWALKER

     TestStackWalk(argv[0]);
     TestStackWalk(argv[0]);

+#endif

 #endif // TEST_STACKWALKER
 
 #ifdef TEST_STDPATHS
 #endif // TEST_STACKWALKER
 
 #ifdef TEST_STDPATHS

diff --git a/samples/except/except.cpp b/samples/except/except.cpp
index fe8740fc9bc14960dfb00d3a729a85bf6c83b8b0..f5423780ab0634d45a774b402e18e7e3b4ee0afd 100644 (file)
--- a/samples/except/except.cpp
+++ b/samples/except/except.cpp
@@ -43,6 +43,7 @@
 
     #include "wx/utils.h"
     #include "wx/msgdlg.h"
 
     #include "wx/utils.h"
     #include "wx/msgdlg.h"

+    #include "wx/icon.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------

diff --git a/samples/render/renddll.cpp b/samples/render/renddll.cpp
index 3a611ab099674fc370ac86e47e39c82892493edd..b3afaf8336cb74f604da756dae650d38d8be5bb7 100644 (file)
--- a/samples/render/renddll.cpp
+++ b/samples/render/renddll.cpp
@@ -63,6 +63,16 @@ public:
     {
     }
 
     {
     }
 

+    // draw a combobox dropdown button
+    //
+    // flags may only use wxCONTROL_PRESSED
+    virtual void DrawComboBoxDropButton(wxWindow *win,
+                                        wxDC& dc,
+                                        const wxRect& rect,
+                                        int flags = 0)
+    {
+    }
+

     // get the splitter parameters: the x field of the returned point is the
     // sash width and the y field is the border width
     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win)
     // get the splitter parameters: the x field of the returned point is the
     // sash width and the y field is the border width
     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win)

diff --git a/samples/scroll/scroll.cpp b/samples/scroll/scroll.cpp
index db04ec3db1ea2b858e2528acc6747c7c18cf8b26..1bec08436a3c29920185a0b15f11fea9cf136290 100644 (file)
--- a/samples/scroll/scroll.cpp
+++ b/samples/scroll/scroll.cpp
@@ -830,7 +830,6 @@ void MyAutoTimedScrollingWindow::OnDraw(wxDC& dc)
     // draw the characters
     // 1. for each update region
     for (wxRegionIterator upd(GetUpdateRegion()); upd; ++upd) {
     // draw the characters
     // 1. for each update region
     for (wxRegionIterator upd(GetUpdateRegion()); upd; ++upd) {

-        wxSize clientSize = GetClientSize();

         wxRect updRect = upd.GetRect();
         wxRect updRectInGChars(DeviceCoordsToGraphicalChars(updRect));
         // 2. for each row of chars in the update region
         wxRect updRect = upd.GetRect();
         wxRect updRectInGChars(DeviceCoordsToGraphicalChars(updRect));
         // 2. for each row of chars in the update region

diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index a1f45ca6c726174a430449bbf29dd69f327e9d52..747a49f1424f9ac70e3c11e81104325c00c18ee1 100644 (file)
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -628,7 +628,8 @@ void MyFrame::OnToolLeftClick(wxCommandEvent& event)
 void MyFrame::OnToolRightClick(wxCommandEvent& event)
 {
     m_textWindow->AppendText(
 void MyFrame::OnToolRightClick(wxCommandEvent& event)
 {
     m_textWindow->AppendText(

-            wxString::Format(_T("Tool %d right clicked.\n"), event.GetInt()));
+            wxString::Format(_T("Tool %d right clicked.\n"),
+                             (int) event.GetInt()));

 }
 
 void MyFrame::OnCombo(wxCommandEvent& event)
 }
 
 void MyFrame::OnCombo(wxCommandEvent& event)

diff --git a/utils/configtool/src/appsettings.cpp b/utils/configtool/src/appsettings.cpp
index a8bc0122efdd4d2ea132bc6f471309e3b5a0fc8c..0016aa669d46aecea4b236d06338735fb2e393a5 100644 (file)
--- a/utils/configtool/src/appsettings.cpp
+++ b/utils/configtool/src/appsettings.cpp
@@ -29,6 +29,7 @@
 #include "wx/effects.h"
 #include "wx/spinctrl.h"
 #include "wx/tooltip.h"
 #include "wx/effects.h"
 #include "wx/spinctrl.h"
 #include "wx/tooltip.h"

+#include "wx/settings.h"

 
 #endif
 
 
 #endif
 

diff --git a/utils/configtool/src/settingsdialog.cpp b/utils/configtool/src/settingsdialog.cpp
index 0cfefa29e0aa07b8f9eaa9400e16e2b72f674aa9..d79eb0a0ae3ba21654f89fc967318a29b0a17659 100644 (file)
--- a/utils/configtool/src/settingsdialog.cpp
+++ b/utils/configtool/src/settingsdialog.cpp
@@ -27,6 +27,9 @@
 #include "wx/scrolwin.h"
 #include "wx/spinctrl.h"
 #include "wx/spinbutt.h"
 #include "wx/scrolwin.h"
 #include "wx/spinctrl.h"
 #include "wx/spinbutt.h"

+#include "wx/sizer.h"
+#include "wx/statbox.h"
+#include "wx/dirdlg.h"

 
 #endif
 
 
 #endif
 

diff --git a/utils/configtool/src/utils.cpp b/utils/configtool/src/utils.cpp
index 8896dae2e745ae6ec42d407ff9f90df61320829c..33a02a7b8ad0c0154e65fe78e6bfb08a52f35afb 100644 (file)
--- a/utils/configtool/src/utils.cpp
+++ b/utils/configtool/src/utils.cpp
@@ -31,6 +31,8 @@
 #include "wx/process.h"
 #include "wx/variant.h"
 #include "wx/cmdline.h"
 #include "wx/process.h"
 #include "wx/variant.h"
 #include "wx/cmdline.h"

+#include "wx/msgdlg.h"
+#include "wx/log.h"

 
 #endif
 
 
 #endif
 

diff --git a/utils/configtool/src/wxconfigtool.h b/utils/configtool/src/wxconfigtool.h
index 56ec135baab892715ee482e48f3042ec831de958..4a1e57fce9d4eab2ebd1f46799f77539d712a57a 100644 (file)
--- a/utils/configtool/src/wxconfigtool.h
+++ b/utils/configtool/src/wxconfigtool.h
@@ -18,6 +18,7 @@
 
 #include "wx/docview.h"
 #include "wx/help.h"
 
 #include "wx/docview.h"
 #include "wx/help.h"

+#include "wx/app.h"

 
 #ifdef __WXMSW__
 #include "wx/msw/helpchm.h"
 
 #ifdef __WXMSW__
 #include "wx/msw/helpchm.h"