From: Mattia Barbon Date: Sun, 6 Feb 2005 10:41:35 +0000 (+0000) Subject: Miscellaneous compilation and warning fixes. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/60c474a0c4f878a68f8e88be2be26bc5de750212 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 793d6cb6e6..c854f774ef 100644 --- 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; } - 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 { diff --git a/samples/console/console.cpp b/samples/console/console.cpp index 49d5721127..382148a1ca 100644 --- a/samples/console/console.cpp +++ b/samples/console/console.cpp @@ -4403,7 +4403,9 @@ int main(int argc, char **argv) #endif #ifdef TEST_STACKWALKER +#if wxUSE_STACKWALKER TestStackWalk(argv[0]); +#endif #endif // TEST_STACKWALKER #ifdef TEST_STDPATHS diff --git a/samples/except/except.cpp b/samples/except/except.cpp index fe8740fc9b..f5423780ab 100644 --- a/samples/except/except.cpp +++ b/samples/except/except.cpp @@ -43,6 +43,7 @@ #include "wx/utils.h" #include "wx/msgdlg.h" + #include "wx/icon.h" #endif // ---------------------------------------------------------------------------- diff --git a/samples/render/renddll.cpp b/samples/render/renddll.cpp index 3a611ab099..b3afaf8336 100644 --- 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) diff --git a/samples/scroll/scroll.cpp b/samples/scroll/scroll.cpp index db04ec3db1..1bec08436a 100644 --- 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) { - wxSize clientSize = GetClientSize(); 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 a1f45ca6c7..747a49f142 100644 --- 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( - 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) diff --git a/utils/configtool/src/appsettings.cpp b/utils/configtool/src/appsettings.cpp index a8bc0122ef..0016aa669d 100644 --- 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/settings.h" #endif diff --git a/utils/configtool/src/settingsdialog.cpp b/utils/configtool/src/settingsdialog.cpp index 0cfefa29e0..d79eb0a0ae 100644 --- 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/sizer.h" +#include "wx/statbox.h" +#include "wx/dirdlg.h" #endif diff --git a/utils/configtool/src/utils.cpp b/utils/configtool/src/utils.cpp index 8896dae2e7..33a02a7b8a 100644 --- 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/msgdlg.h" +#include "wx/log.h" #endif diff --git a/utils/configtool/src/wxconfigtool.h b/utils/configtool/src/wxconfigtool.h index 56ec135baa..4a1e57fce9 100644 --- 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/app.h" #ifdef __WXMSW__ #include "wx/msw/helpchm.h"