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

Fixed some warnings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2013-03-13 09:05:52 +00:00
parent 404b319a85
commit 43f4e852a1
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/richtext/richtextfontpage.cpp
View File

@@ -547,7 +547,7 @@ bool wxRichTextFontPage::TransferDataToWindow()
if (attr->HasFontWeight()) if (attr->HasFontWeight())
{ {
if (attr->GetFontWeight() == wxBOLD) if (attr->GetFontWeight() == wxFONTWEIGHT_BOLD)
m_weightCtrl->SetSelection(2); m_weightCtrl->SetSelection(2);
else else
m_weightCtrl->SetSelection(1); m_weightCtrl->SetSelection(1);
@@ -559,7 +559,7 @@ bool wxRichTextFontPage::TransferDataToWindow()
if (attr->HasFontItalic()) if (attr->HasFontItalic())
{ {
if (attr->GetFontStyle() == wxITALIC) if (attr->GetFontStyle() == wxFONTSTYLE_ITALIC)
m_styleCtrl->SetSelection(2); m_styleCtrl->SetSelection(2);
else else
m_styleCtrl->SetSelection(1); m_styleCtrl->SetSelection(1);

12
src/richtext/richtexthtml.cpp
View File

@@ -226,9 +226,9 @@ void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxRichTextAttr& curre
m_font = true; m_font = true;
} }
if (thisStyle.GetFontWeight() == wxBOLD) if (thisStyle.GetFontWeight() == wxFONTWEIGHT_BOLD)
str << wxT("<b>"); str << wxT("<b>");
if (thisStyle.GetFontStyle() == wxITALIC) if (thisStyle.GetFontStyle() == wxFONTSTYLE_ITALIC)
str << wxT("<i>"); str << wxT("<i>");
if (thisStyle.GetFontUnderlined()) if (thisStyle.GetFontUnderlined())
str << wxT("<u>"); str << wxT("<u>");
@@ -254,9 +254,9 @@ void wxRichTextHTMLHandler::EndCharacterFormatting(const wxRichTextAttr& WXUNUSE
if (thisStyle.GetFontUnderlined()) if (thisStyle.GetFontUnderlined())
stream << wxT("</u>"); stream << wxT("</u>");
if (thisStyle.GetFontStyle() == wxITALIC) if (thisStyle.GetFontStyle() == wxFONTSTYLE_ITALIC)
stream << wxT("</i>"); stream << wxT("</i>");
if (thisStyle.GetFontWeight() == wxBOLD) if (thisStyle.GetFontWeight() == wxFONTWEIGHT_BOLD)
stream << wxT("</b>"); stream << wxT("</b>");
if (thisStyle.HasTextEffects()) if (thisStyle.HasTextEffects())
@@ -522,7 +522,7 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s
if (img.IsOk()) if (img.IsOk())
{ {
wxString ext(image->GetImageBlock().GetExtension()); wxString ext(image->GetImageBlock().GetExtension());
wxString tempFilename(wxString::Format(wxT("image%d.%s"), sm_fileCounter, ext)); wxString tempFilename(wxString::Format(wxT("image%d.%s"), sm_fileCounter, ext.c_str()));
wxMemoryFSHandler::AddFile(tempFilename, img, image->GetImageBlock().GetImageType()); wxMemoryFSHandler::AddFile(tempFilename, img, image->GetImageBlock().GetImageType());
m_imageLocations.Add(tempFilename); m_imageLocations.Add(tempFilename);
@@ -551,7 +551,7 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s
tempDir = wxFileName::GetTempDir(); tempDir = wxFileName::GetTempDir();
wxString ext(image->GetImageBlock().GetExtension()); wxString ext(image->GetImageBlock().GetExtension());
wxString tempFilename(wxString::Format(wxT("%s/image%d.%s"), tempDir, sm_fileCounter, ext)); wxString tempFilename(wxString::Format(wxT("%s/image%d.%s"), tempDir.c_str(), sm_fileCounter, ext.c_str()));
image->GetImageBlock().Write(tempFilename); image->GetImageBlock().Write(tempFilename);
m_imageLocations.Add(tempFilename); m_imageLocations.Add(tempFilename);

4
src/richtext/richtextstyles.cpp
View File

@@ -843,9 +843,9 @@ wxString wxRichTextStyleListBox::CreateHTML(wxRichTextStyleDefinition* def) cons
bool hasItalic = false; bool hasItalic = false;
bool hasUnderline = false; bool hasUnderline = false;
if (attr.GetFontWeight() == wxBOLD) if (attr.GetFontWeight() == wxFONTWEIGHT_BOLD)
hasBold = true; hasBold = true;
if (attr.GetFontStyle() == wxITALIC) if (attr.GetFontStyle() == wxFONTSTYLE_ITALIC)
hasItalic = true; hasItalic = true;
if (attr.GetFontUnderlined()) if (attr.GetFontUnderlined())
hasUnderline = true; hasUnderline = true;