AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

warning fixes/minor cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett 2006-10-09 07:37:25 +00:00
parent 38b130853f
commit 07854e5edd
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/richtext/richtextctrl.cpp
View File

@ -242,8 +242,6 @@ void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
// Paint the background // Paint the background
PaintBackground(dc); PaintBackground(dc);
wxRegion dirtyRegion = GetUpdateRegion();
wxRect drawingArea(GetLogicalPoint(wxPoint(0, 0)), GetClientSize()); wxRect drawingArea(GetLogicalPoint(wxPoint(0, 0)), GetClientSize());
wxRect availableSpace(GetClientSize()); wxRect availableSpace(GetClientSize());
if (GetBuffer().GetDirty()) if (GetBuffer().GetDirty())

4
src/richtext/richtexthtml.cpp
View File

@ -556,7 +556,7 @@ wxChar* wxRichTextHTMLHandler::b64enc( unsigned char* input, size_t in_len )
*p++ = enc64[ (a >> 2) & 0x3f ]; *p++ = enc64[ (a >> 2) & 0x3f ];
if( in_len-- <= 0 ) if( in_len-- == 0 )
{ {
*p++ = enc64[ (a << 4 ) & 0x30 ]; *p++ = enc64[ (a << 4 ) & 0x30 ];
*p++ = '='; *p++ = '=';
@ -568,7 +568,7 @@ wxChar* wxRichTextHTMLHandler::b64enc( unsigned char* input, size_t in_len )
*p++ = enc64[(( a << 4 ) | ((b >> 4) &0xf )) & 0x3f]; *p++ = enc64[(( a << 4 ) | ((b >> 4) &0xf )) & 0x3f];
if( in_len-- <= 0 ) if( in_len-- == 0 )
{ {
*p++ = enc64[ (b << 2) & 0x3f ]; *p++ = enc64[ (b << 2) & 0x3f ];
*p++ = '='; *p++ = '=';

19
src/richtext/richtextsymboldlg.cpp
View File

@ -16,6 +16,10 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_RICHTEXT
#include "wx/richtext/richtextsymboldlg.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif
@ -27,8 +31,6 @@
#include "wx/dcbuffer.h" #include "wx/dcbuffer.h"
#include "wx/settings.h" #include "wx/settings.h"
#include "../../include/wx/richtext/richtextsymboldlg.h"
////@begin XPM images ////@begin XPM images
////@end XPM images ////@end XPM images
@ -505,9 +507,7 @@ bool wxSymbolPickerDialog::TransferDataToWindow()
if (m_fontCtrl->GetCount() == 0) if (m_fontCtrl->GetCount() == 0)
{ {
wxFontEnumerator enumerator; wxArrayString faceNames = wxFontEnumerator::GetFacenames();
enumerator.EnumerateFacenames();
wxArrayString faceNames = enumerator.GetFacenames();
faceNames.Sort(); faceNames.Sort();
faceNames.Insert(_("(Normal text)"), 0); faceNames.Insert(_("(Normal text)"), 0);
@ -853,8 +853,9 @@ bool wxSymbolListCtrl::DoSetCurrent(int current)
{ {
// it is, indeed, only partly visible, so scroll it into view to // it is, indeed, only partly visible, so scroll it into view to
// make it entirely visible // make it entirely visible
while ( (size_t)lineNo == GetLastVisibleLine() && while ( unsigned(lineNo) == GetLastVisibleLine() &&
ScrollToLine(GetVisibleBegin()+1) ) ; ScrollToLine(GetVisibleBegin()+1) )
;
// but in any case refresh it as even if it was only partly visible // but in any case refresh it as even if it was only partly visible
// before we need to redraw it entirely as its background changed // before we need to redraw it entirely as its background changed
@ -1231,7 +1232,7 @@ int wxSymbolListCtrl::HitTest(const wxPoint& pt)
if (symbol >= m_minSymbolValue && symbol <= m_maxSymbolValue) if (symbol >= m_minSymbolValue && symbol <= m_maxSymbolValue)
return symbol; return symbol;
else
return -1; return -1;
} }
@ -1286,4 +1287,4 @@ wxSymbolListCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
return wxListBox::GetClassDefaultAttributes(variant); return wxListBox::GetClassDefaultAttributes(variant);
} }
#endif // wxUSE_RICHTEXT

2
src/richtext/richtextxml.cpp
View File

@ -361,7 +361,7 @@ static void OutputStringEnt(wxOutputStream& stream, const wxString& str,
} }
last = i + 1; last = i + 1;
} }
else if ((unsigned long)c > 127) else if (wxUChar(c) > 127)
{ {
OutputString(stream, str.Mid(last, i - last), convMem, convFile); OutputString(stream, str.Mid(last, i - last), convMem, convFile);