MinGW warning fix.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-01-18 19:50:43 +00:00
parent cd2e10d695
commit a09cd1895e
3 changed files with 16 additions and 15 deletions

View File

@@ -226,7 +226,7 @@ wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive)
// remember the alt encoding for this charset -- or remember that
// we don't know it
long value = n == -1 ? wxFONTENCODING_UNKNOWN : (long)encoding;
long value = n == -1 ? (long)wxFONTENCODING_UNKNOWN : (long)encoding;
if ( !config->Write(charset, value) )
{
wxLogError(_("Failed to remember the encoding for the charset '%s'."), charset.c_str());

View File

@@ -502,7 +502,7 @@ void wxSplitterWindow::DrawSash(wxDC& dc)
m_sashPosition,
m_splitMode == wxSPLIT_VERTICAL ? wxVERTICAL
: wxHORIZONTAL,
m_isHot ? wxCONTROL_CURRENT : 0
m_isHot ? (int)wxCONTROL_CURRENT : 0
);
}
@@ -711,7 +711,7 @@ void wxSplitterWindow::Initialize(wxWindow *window)
if (! window->IsShown())
window->Show();
m_windowOne = window;
m_windowTwo = (wxWindow *) NULL;
DoSetSashPosition(0);
@@ -737,7 +737,7 @@ bool wxSplitterWindow::DoSplit(wxSplitMode mode,
window1->Show();
if (! window2->IsShown())
window2->Show();
m_splitMode = mode;
m_windowOne = window1;
m_windowTwo = window2;