Include correct headers from richtextimagedlg.*.

Include or forward declares the classes used by the header to make it
self-contained. Do not include wx/wx.h from the source file to make compiling
it faster when not using PCH.

This fixes compilation under Unix after SOC2010_RTC_IMAGES branch merge.

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

diff --git a/include/wx/richtext/richtextimagedlg.h b/include/wx/richtext/richtextimagedlg.h
index bea7665a18807f3d58657adcd73f19d1118ad85e..e54053dcc061d4eeea311ab462548f4f8fc0bd28 100644 (file)
--- a/include/wx/richtext/richtextimagedlg.h
+++ b/include/wx/richtext/richtextimagedlg.h
@@ -9,6 +9,8 @@
 // Licence:     wxWindows licence\r
 /////////////////////////////////////////////////////////////////////////////\r
 \r
+#include "wx/dialog.h"\r
+\r
 #ifndef _RICHTEXTIMAGEDLG_H_\r
 #define _RICHTEXTIMAGEDLG_H_\r
 \r
@@ -16,16 +18,14 @@
  * Includes\r
  */\r
 #include "wx/richtext/richtextbuffer.h"\r
-////@begin includes\r
-#include "wx/statline.h"\r
-////@end includes\r
 \r
 /*!\r
  * Forward declarations\r
  */\r
 \r
-////@begin forward declarations\r
-////@end forward declarations\r
+class WXDLLIMPEXP_FWD_CORE wxButton;\r
+class WXDLLIMPEXP_FWD_CORE wxComboBox;\r
+class WXDLLIMPEXP_FWD_CORE wxTextCtrl;\r
 \r
 /*!\r
  * Control identifiers\r

diff --git a/src/richtext/richtextimagedlg.cpp b/src/richtext/richtextimagedlg.cpp
index 33f9050eda7152cf1792892ec44f10946f00d655..ac2b023c447f35f4cd75fa417e4d73b9474b41f5 100644 (file)
--- a/src/richtext/richtextimagedlg.cpp
+++ b/src/richtext/richtextimagedlg.cpp
@@ -17,11 +17,12 @@
 #endif\r
 \r
 #ifndef WX_PRECOMP\r
-#include "wx/wx.h"\r
+    #include "wx/button.h"\r
+    #include "wx/combobox.h"\r
+    #include "wx/textctrl.h"\r
 #endif\r
 \r
-////@begin includes\r
-////@end includes\r
+#include "wx/statline.h"\r
 \r
 #include "wx/richtext/richtextimagedlg.h"\r
 #include "wx/richtext/richtextctrl.h"\r