Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix a couple of harmless warnings reported by g++ 4.3

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@55256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-08-25 14:39:11 +00:00
parent d4e889f3c7
commit f837582af4
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/generic/prntdlgg.cpp
View File

@@ -201,9 +201,9 @@ void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))
if (factory->HasStatusLine()) if (factory->HasStatusLine())
{ {
flex->Add( new wxStaticText( this, wxID_ANY, _("Status:") ), flex->Add( new wxStaticText( this, wxID_ANY, _("Status:") ),
0, wxALIGN_CENTER_VERTICAL|wxALL-wxTOP, 5 ); 0, wxALIGN_CENTER_VERTICAL|(wxALL-wxTOP), 5 );
flex->Add( new wxStaticText( this, wxID_ANY, factory->CreateStatusLine() ), flex->Add( new wxStaticText( this, wxID_ANY, factory->CreateStatusLine() ),
0, wxALIGN_CENTER_VERTICAL|wxALL-wxTOP, 5 ); 0, wxALIGN_CENTER_VERTICAL|(wxALL-wxTOP), 5 );
} }
mainsizer->Add( topsizer, 0, wxLEFT|wxTOP|wxRIGHT|wxGROW, 10 ); mainsizer->Add( topsizer, 0, wxLEFT|wxTOP|wxRIGHT|wxGROW, 10 );
@@ -354,10 +354,12 @@ bool wxGenericPrintDialog::TransferDataToWindow()
if (m_printDialogData.GetToPage() > 0) if (m_printDialogData.GetToPage() > 0)
m_toText->SetValue(wxString::Format(_T("%d"), m_printDialogData.GetToPage())); m_toText->SetValue(wxString::Format(_T("%d"), m_printDialogData.GetToPage()));
if(m_rangeRadioBox) if(m_rangeRadioBox)
{
if (m_printDialogData.GetAllPages() || m_printDialogData.GetFromPage() == 0) if (m_printDialogData.GetAllPages() || m_printDialogData.GetFromPage() == 0)
m_rangeRadioBox->SetSelection(0); m_rangeRadioBox->SetSelection(0);
else else
m_rangeRadioBox->SetSelection(1); m_rangeRadioBox->SetSelection(1);
}
} }
else else
{ {

4
src/richtext/richtextbuffer.cpp
View File

@@ -925,7 +925,7 @@ wxRichTextLine* wxRichTextParagraphLayoutBox::GetLineAtPosition(long pos, bool c
// If the position is end-of-paragraph, then return the last line of // If the position is end-of-paragraph, then return the last line of
// of the paragraph. // of the paragraph.
(range.GetEnd() == child->GetRange().GetEnd()-1) && (pos == child->GetRange().GetEnd())) ((range.GetEnd() == child->GetRange().GetEnd()-1) && (pos == child->GetRange().GetEnd())))
return line; return line;
node2 = node2->GetNext(); node2 = node2->GetNext();
@@ -6550,7 +6550,7 @@ wxString wxRichTextBuffer::GetExtWildcard(bool combine, bool save, wxArrayInt* t
while (node) while (node)
{ {
wxRichTextFileHandler* handler = (wxRichTextFileHandler*) node->GetData(); wxRichTextFileHandler* handler = (wxRichTextFileHandler*) node->GetData();
if (handler->IsVisible() && ((save && handler->CanSave()) || !save && handler->CanLoad())) if (handler->IsVisible() && ((save && handler->CanSave()) || (!save && handler->CanLoad())))
{ {
if (combine) if (combine)
{ {