From 07854e5edda33cdb2c4ff50f545f7a3eb94badc3 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@bullseye.com>
Date: Mon, 9 Oct 2006 07:37:25 +0000
Subject: [PATCH] warning fixes/minor cleanup

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/richtext/richtextctrl.cpp      |  2 --
 src/richtext/richtexthtml.cpp      |  4 ++--
 src/richtext/richtextsymboldlg.cpp | 19 ++++++++++---------
 src/richtext/richtextxml.cpp       |  2 +-
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index 33b82d9..f480f23 100644
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -242,8 +242,6 @@ void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
         // Paint the background
         PaintBackground(dc);
 
-        wxRegion dirtyRegion = GetUpdateRegion();
-
         wxRect drawingArea(GetLogicalPoint(wxPoint(0, 0)), GetClientSize());
         wxRect availableSpace(GetClientSize());
         if (GetBuffer().GetDirty())
diff --git a/src/richtext/richtexthtml.cpp b/src/richtext/richtexthtml.cpp
index 2332664..4326e33 100644
--- a/src/richtext/richtexthtml.cpp
+++ b/src/richtext/richtexthtml.cpp
@@ -556,7 +556,7 @@ wxChar* wxRichTextHTMLHandler::b64enc( unsigned char* input, size_t in_len )
 
         *p++ = enc64[ (a >> 2) & 0x3f ];
 
-        if( in_len-- <= 0 )
+        if( in_len-- == 0 )
         {
             *p++ = enc64[ (a << 4 ) & 0x30 ];
             *p++ = '=';
@@ -568,7 +568,7 @@ wxChar* wxRichTextHTMLHandler::b64enc( unsigned char* input, size_t in_len )
 
         *p++ = enc64[(( a << 4 ) | ((b >> 4) &0xf )) & 0x3f];
 
-        if( in_len-- <= 0 )
+        if( in_len-- == 0 )
         {
             *p++ = enc64[ (b << 2) & 0x3f ];
             *p++ = '=';
diff --git a/src/richtext/richtextsymboldlg.cpp b/src/richtext/richtextsymboldlg.cpp
index 05d5977..7f53ddd 100644
--- a/src/richtext/richtextsymboldlg.cpp
+++ b/src/richtext/richtextsymboldlg.cpp
@@ -16,6 +16,10 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_RICHTEXT
+
+#include "wx/richtext/richtextsymboldlg.h"
+
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
@@ -27,8 +31,6 @@
 #include "wx/dcbuffer.h"
 #include "wx/settings.h"
 
-#include "../../include/wx/richtext/richtextsymboldlg.h"
-
 ////@begin XPM images
 ////@end XPM images
 
@@ -505,9 +507,7 @@ bool wxSymbolPickerDialog::TransferDataToWindow()
 
     if (m_fontCtrl->GetCount() == 0)
     {
-        wxFontEnumerator enumerator;
-        enumerator.EnumerateFacenames();
-        wxArrayString faceNames = enumerator.GetFacenames();
+        wxArrayString faceNames = wxFontEnumerator::GetFacenames();
         faceNames.Sort();
 
         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
             // make it entirely visible
-            while ( (size_t)lineNo == GetLastVisibleLine() &&
-                    ScrollToLine(GetVisibleBegin()+1) ) ;
+            while ( unsigned(lineNo) == GetLastVisibleLine() &&
+                    ScrollToLine(GetVisibleBegin()+1) )
+                ;
 
             // 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
@@ -1231,7 +1232,7 @@ int wxSymbolListCtrl::HitTest(const wxPoint& pt)
 
     if (symbol >= m_minSymbolValue && symbol <= m_maxSymbolValue)
         return symbol;
-    else
+
     return -1;
 }
 
@@ -1286,4 +1287,4 @@ wxSymbolListCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
     return wxListBox::GetClassDefaultAttributes(variant);
 }
 
-
+#endif // wxUSE_RICHTEXT
diff --git a/src/richtext/richtextxml.cpp b/src/richtext/richtextxml.cpp
index cab26bf..eed0a71 100644
--- a/src/richtext/richtextxml.cpp
+++ b/src/richtext/richtextxml.cpp
@@ -361,7 +361,7 @@ static void OutputStringEnt(wxOutputStream& stream, const wxString& str,
             }
             last = i + 1;
         }
-        else if ((unsigned long)c > 127)
+        else if (wxUChar(c) > 127)
         {
             OutputString(stream, str.Mid(last, i - last), convMem, convFile);
 
-- 
2.7.4