Get/SetTitle only for wxTopLevelWindow (wxGTK part).

[wxWidgets.git] / src / richtext / richtextstyles.cpp

diff --git a/src/richtext/richtextstyles.cpp b/src/richtext/richtextstyles.cpp
index e1dd06b17e704b9a3b0a765b23901771995f9145..1a4d342fca69e834e558747db8019c3901b86b26 100644 (file)
--- a/src/richtext/richtextstyles.cpp
+++ b/src/richtext/richtextstyles.cpp
@@ -16,20 +16,19 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

+#if wxUSE_RICHTEXT
+
+#include "wx/richtext/richtextstyles.h"
+

 #ifndef WX_PRECOMP
   #include "wx/wx.h"
 #endif
 
 #ifndef WX_PRECOMP
   #include "wx/wx.h"
 #endif
 

-#include "wx/image.h"
-
-#if wxUSE_RICHTEXT
-

 #include "wx/filename.h"
 #include "wx/clipbrd.h"
 #include "wx/wfstream.h"
 #include "wx/module.h"
 
 #include "wx/filename.h"
 #include "wx/clipbrd.h"
 #include "wx/wfstream.h"
 #include "wx/module.h"
 

-#include "wx/richtext/richtextstyles.h"

 #include "wx/richtext/richtextctrl.h"
 
 IMPLEMENT_CLASS(wxRichTextStyleDefinition, wxObject)
 #include "wx/richtext/richtextctrl.h"
 
 IMPLEMENT_CLASS(wxRichTextStyleDefinition, wxObject)


@@ -58,11 +57,11 @@ bool wxRichTextStyleSheet::AddStyle(wxList& list, wxRichTextStyleDefinition* def
 /// Remove a style
 bool wxRichTextStyleSheet::RemoveStyle(wxList& list, wxRichTextStyleDefinition* def, bool deleteStyle)
 {
 /// Remove a style
 bool wxRichTextStyleSheet::RemoveStyle(wxList& list, wxRichTextStyleDefinition* def, bool deleteStyle)
 {

-    wxNode* node = list.Find(def);
+    wxList::compatibility_iterator node = list.Find(def);

     if (node)
     {
         wxRichTextStyleDefinition* def = (wxRichTextStyleDefinition*) node->GetData();
     if (node)
     {
         wxRichTextStyleDefinition* def = (wxRichTextStyleDefinition*) node->GetData();

-        delete node;
+        list.Erase(node);

         if (deleteStyle)
             delete def;
         return true;
         if (deleteStyle)
             delete def;
         return true;


@@ -74,7 +73,7 @@ bool wxRichTextStyleSheet::RemoveStyle(wxList& list, wxRichTextStyleDefinition*
 /// Find a definition by name
 wxRichTextStyleDefinition* wxRichTextStyleSheet::FindStyle(const wxList& list, const wxString& name) const
 {
 /// Find a definition by name
 wxRichTextStyleDefinition* wxRichTextStyleSheet::FindStyle(const wxList& list, const wxString& name) const
 {

-    for (wxNode* node = list.GetFirst(); node; node = node->GetNext())
+    for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext())

     {
         wxRichTextStyleDefinition* def = (wxRichTextStyleDefinition*) node->GetData();
         if (def->GetName().Lower() == name.Lower())
     {
         wxRichTextStyleDefinition* def = (wxRichTextStyleDefinition*) node->GetData();
         if (def->GetName().Lower() == name.Lower())