Compile fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/richtext/richtextformatdlg.h b/include/wx/richtext/richtextformatdlg.h
index 1f22c147f219a87da18d37326ed97f118d1c5093..de3aa666a853265e86b6b54340d25ed63c298296 100644 (file)
--- a/include/wx/richtext/richtextformatdlg.h
+++ b/include/wx/richtext/richtextformatdlg.h
@@ -33,6 +33,8 @@
 
 class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextFormattingDialog;
 class WXDLLIMPEXP_FWD_CORE wxImageList;
 
 class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextFormattingDialog;
 class WXDLLIMPEXP_FWD_CORE wxImageList;

+class WXDLLIMPEXP_FWD_CORE wxComboBox;
+class WXDLLIMPEXP_FWD_CORE wxCheckBox;

 
 /*!
  * Flags determining the pages and buttons to be created in the dialog
 
 /*!
  * Flags determining the pages and buttons to be created in the dialog

diff --git a/include/wx/richtext/richtextimagedlg.h b/include/wx/richtext/richtextimagedlg.h
index d80725ac97c1db9ad47eb244a894c5591a67b055..3a0b91491f57d6a109c30bb36abdae58310a5c05 100644 (file)
--- a/include/wx/richtext/richtextimagedlg.h
+++ b/include/wx/richtext/richtextimagedlg.h
@@ -14,21 +14,22 @@
 #ifndef _RICHTEXTIMAGEDLG_H_
 #define _RICHTEXTIMAGEDLG_H_
 
 #ifndef _RICHTEXTIMAGEDLG_H_
 #define _RICHTEXTIMAGEDLG_H_
 

-/*!
- * Includes
- */
-
-#include "wx/richtext/richtextbuffer.h"
-#include "wx/richtext/richtextformatdlg.h"
-

 /*!
  * Forward declarations
  */
 
 class WXDLLIMPEXP_FWD_CORE wxButton;
 class WXDLLIMPEXP_FWD_CORE wxComboBox;
 /*!
  * Forward declarations
  */
 
 class WXDLLIMPEXP_FWD_CORE wxButton;
 class WXDLLIMPEXP_FWD_CORE wxComboBox;

+class WXDLLIMPEXP_FWD_CORE wxCheckBox;

 class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 
 class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 

+/*!
+ * Includes
+ */
+
+#include "wx/richtext/richtextbuffer.h"
+#include "wx/richtext/richtextformatdlg.h"
+

 /*!
  * Control identifiers
  */
 /*!
  * Control identifiers
  */

diff --git a/include/wx/richtext/richtextuicustomization.h b/include/wx/richtext/richtextuicustomization.h
index ea20a60d69e09faab3f2c6f7d9e1fa6568971558..d507aba2fa6a5b5ece83b9e3bde8139870cb13b1 100644 (file)
--- a/include/wx/richtext/richtextuicustomization.h
+++ b/include/wx/richtext/richtextuicustomization.h
@@ -14,6 +14,8 @@
 
 #if wxUSE_RICHTEXT
 
 
 #if wxUSE_RICHTEXT
 

+#include "wx/window.h"
+

 /**
     @class wxRichTextUICustomization
     The base class for functionality to plug in to various rich text control dialogs,
 /**
     @class wxRichTextUICustomization
     The base class for functionality to plug in to various rich text control dialogs,

diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index 83c74a023f623235353cfda01fe39042d3ac5776..86e5bdab6641f2fde7c307279e3f7ac30a502d6c 100644 (file)
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -8,7 +8,7 @@
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-wxRICHTEXT_NONE
+

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

diff --git a/src/richtext/richtextxml.cpp b/src/richtext/richtextxml.cpp
index 5f2f84cbe96a969daac0977c9e937b9e478f15cc..c5c91cfc07a617e000c511dd561f4805468a10fc 100644 (file)
--- a/src/richtext/richtextxml.cpp
+++ b/src/richtext/richtextxml.cpp
@@ -1199,9 +1199,9 @@ wxString wxRichTextXMLHandler::AddAttributes(const wxRichTextAttr& attr, bool is
         wxString value;
         if (attr.GetTextBoxAttr().GetClearMode() == wxTEXT_BOX_ATTR_CLEAR_LEFT)
             value = wxT("left");
         wxString value;
         if (attr.GetTextBoxAttr().GetClearMode() == wxTEXT_BOX_ATTR_CLEAR_LEFT)
             value = wxT("left");

-        else if (attr.GetTextBoxAttr().GetFloatMode() == wxTEXT_BOX_ATTR_CLEAR_RIGHT)
+        else if (attr.GetTextBoxAttr().GetClearMode() == wxTEXT_BOX_ATTR_CLEAR_RIGHT)

             value = wxT("right");
             value = wxT("right");

-        else if (attr.GetTextBoxAttr().GetFloatMode() == wxTEXT_BOX_ATTR_CLEAR_BOTH)
+        else if (attr.GetTextBoxAttr().GetClearMode() == wxTEXT_BOX_ATTR_CLEAR_BOTH)

             value = wxT("both");
         else
             value = wxT("none");
             value = wxT("both");
         else
             value = wxT("none");


@@ -1473,9 +1473,9 @@ bool wxRichTextXMLHandler::AddAttributes(wxXmlNode* node, wxRichTextAttr& attr,
         wxString value;
         if (attr.GetTextBoxAttr().GetClearMode() == wxTEXT_BOX_ATTR_CLEAR_LEFT)
             value = wxT("left");
         wxString value;
         if (attr.GetTextBoxAttr().GetClearMode() == wxTEXT_BOX_ATTR_CLEAR_LEFT)
             value = wxT("left");

-        else if (attr.GetTextBoxAttr().GetFloatMode() == wxTEXT_BOX_ATTR_CLEAR_RIGHT)
+        else if (attr.GetTextBoxAttr().GetClearMode() == wxTEXT_BOX_ATTR_CLEAR_RIGHT)

             value = wxT("right");
             value = wxT("right");

-        else if (attr.GetTextBoxAttr().GetFloatMode() == wxTEXT_BOX_ATTR_CLEAR_BOTH)
+        else if (attr.GetTextBoxAttr().GetClearMode() == wxTEXT_BOX_ATTR_CLEAR_BOTH)

             value = wxT("both");
         else
             value = wxT("none");
             value = wxT("both");
         else
             value = wxT("none");