Miscellaneous compilation and warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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
|
||||||
{
|
{
|
||||||
|
@@ -4403,7 +4403,9 @@ int main(int argc, char **argv)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef TEST_STACKWALKER
|
#ifdef TEST_STACKWALKER
|
||||||
|
#if wxUSE_STACKWALKER
|
||||||
TestStackWalk(argv[0]);
|
TestStackWalk(argv[0]);
|
||||||
|
#endif
|
||||||
#endif // TEST_STACKWALKER
|
#endif // TEST_STACKWALKER
|
||||||
|
|
||||||
#ifdef TEST_STDPATHS
|
#ifdef TEST_STDPATHS
|
||||||
|
@@ -43,6 +43,7 @@
|
|||||||
|
|
||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
#include "wx/msgdlg.h"
|
#include "wx/msgdlg.h"
|
||||||
|
#include "wx/icon.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@@ -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
|
// get the splitter parameters: the x field of the returned point is the
|
||||||
// sash width and the y field is the border width
|
// sash width and the y field is the border width
|
||||||
virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win)
|
virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win)
|
||||||
|
@@ -830,7 +830,6 @@ void MyAutoTimedScrollingWindow::OnDraw(wxDC& dc)
|
|||||||
// draw the characters
|
// draw the characters
|
||||||
// 1. for each update region
|
// 1. for each update region
|
||||||
for (wxRegionIterator upd(GetUpdateRegion()); upd; ++upd) {
|
for (wxRegionIterator upd(GetUpdateRegion()); upd; ++upd) {
|
||||||
wxSize clientSize = GetClientSize();
|
|
||||||
wxRect updRect = upd.GetRect();
|
wxRect updRect = upd.GetRect();
|
||||||
wxRect updRectInGChars(DeviceCoordsToGraphicalChars(updRect));
|
wxRect updRectInGChars(DeviceCoordsToGraphicalChars(updRect));
|
||||||
// 2. for each row of chars in the update region
|
// 2. for each row of chars in the update region
|
||||||
|
@@ -628,7 +628,8 @@ void MyFrame::OnToolLeftClick(wxCommandEvent& event)
|
|||||||
void MyFrame::OnToolRightClick(wxCommandEvent& event)
|
void MyFrame::OnToolRightClick(wxCommandEvent& event)
|
||||||
{
|
{
|
||||||
m_textWindow->AppendText(
|
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)
|
||||||
|
@@ -29,6 +29,7 @@
|
|||||||
#include "wx/effects.h"
|
#include "wx/effects.h"
|
||||||
#include "wx/spinctrl.h"
|
#include "wx/spinctrl.h"
|
||||||
#include "wx/tooltip.h"
|
#include "wx/tooltip.h"
|
||||||
|
#include "wx/settings.h"
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@@ -27,6 +27,9 @@
|
|||||||
#include "wx/scrolwin.h"
|
#include "wx/scrolwin.h"
|
||||||
#include "wx/spinctrl.h"
|
#include "wx/spinctrl.h"
|
||||||
#include "wx/spinbutt.h"
|
#include "wx/spinbutt.h"
|
||||||
|
#include "wx/sizer.h"
|
||||||
|
#include "wx/statbox.h"
|
||||||
|
#include "wx/dirdlg.h"
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@@ -31,6 +31,8 @@
|
|||||||
#include "wx/process.h"
|
#include "wx/process.h"
|
||||||
#include "wx/variant.h"
|
#include "wx/variant.h"
|
||||||
#include "wx/cmdline.h"
|
#include "wx/cmdline.h"
|
||||||
|
#include "wx/msgdlg.h"
|
||||||
|
#include "wx/log.h"
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
#include "wx/docview.h"
|
#include "wx/docview.h"
|
||||||
#include "wx/help.h"
|
#include "wx/help.h"
|
||||||
|
#include "wx/app.h"
|
||||||
|
|
||||||
#ifdef __WXMSW__
|
#ifdef __WXMSW__
|
||||||
#include "wx/msw/helpchm.h"
|
#include "wx/msw/helpchm.h"
|
||||||
|
Reference in New Issue
Block a user