Make wxJoystick::GetNumberJoystick a static method, as the number of

[wxWidgets.git] / include / wx / richtext / richtextxml.h

diff --git a/include/wx/richtext/richtextxml.h b/include/wx/richtext/richtextxml.h
index be318f9f3aa15ede80e21a6c1087c73d521474cd..9f4cf24533b25eafa7c73aafaeb62b9ad9ddbaa8 100644 (file)
--- a/include/wx/richtext/richtextxml.h
+++ b/include/wx/richtext/richtextxml.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        richeditxml.h
+// Name:        wx/richtext/richeditxml.h
 // Purpose:     XML and HTML I/O for wxRichTextCtrl
 // Author:      Julian Smart
-// Modified by: 
+// Modified by:
 // Created:     2005-09-30
-// RCS-ID:      
+// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,12 +16,10 @@
  * Includes
  */
 
-#include "wx/defs.h"
-
-#if wxUSE_RICHTEXT
-
 #include "wx/richtext/richtextbuffer.h"
 
+#if wxUSE_RICHTEXT && wxUSE_XML
+
 /*!
  * wxRichTextXMLHandler
  */
@@ -37,8 +35,8 @@ public:
         { }
 
 #if wxUSE_STREAMS
-    virtual bool LoadFile(wxRichTextBuffer *buffer, wxInputStream& stream);
-    virtual bool SaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream);
+    virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream);
+    virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream);
 
     /// Recursively export an object
     bool ExportXML(wxOutputStream& stream, wxMBConv* convMem, wxMBConv* convFile, wxRichTextObject& obj, int level);
@@ -84,8 +82,8 @@ public:
         { }
 
 #if wxUSE_STREAMS
-    virtual bool LoadFile(wxRichTextBuffer *buffer, wxInputStream& stream);
-    virtual bool SaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream);
+    virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream);
+    virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream);
 #endif
 
     /// Can we save using this handler?
@@ -108,7 +106,7 @@ protected:
 };
 
 #endif
-    // wxUSE_RICHTEXT
+    // wxUSE_RICHTEXT && wxUSE_XML
 
 #endif
     // _WX_RICHTEXTXML_H_