Include wx/dataobj.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/include/wx/wx.h b/include/wx/wx.h
index bba9811acfac8c06aad636b134c76408f103d487..4ed8a6d41739b30158c309aeb581f9346801e6f1 100644 (file)
--- a/include/wx/wx.h
+++ b/include/wx/wx.h
@@ -62,6 +62,7 @@
 #include "wx/settings.h"
 #include "wx/msgdlg.h"
 #include "wx/cmndata.h"
+#include "wx/dataobj.h"
 
 #include "wx/control.h"
 #include "wx/ctrlsub.h"

diff --git a/src/cocoa/dataobj.mm b/src/cocoa/dataobj.mm
index e48b8fef0980f1ae79bb598d87af624e78c2aabf..adebffdf243f5ff2a72f961ad34d00bffe25d262 100644 (file)
--- a/src/cocoa/dataobj.mm
+++ b/src/cocoa/dataobj.mm
@@ -6,16 +6,17 @@
 // Created:     2003/07/23
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:    wxWidgets licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #if wxUSE_DATAOBJ
 
+#include "wx/dataobj.h"
+
 #ifndef WX_PRECOMP
 #endif //WX_PRECOMP
-#include "wx/dataobj.h"
 
 wxDataObject::wxDataObject()
 {

diff --git a/src/generic/hyperlink.cpp b/src/generic/hyperlink.cpp
index 4288e4c3037b6c686fd06d46b1b9be55946eeefe..fb245d32b22002bed8890b49a244711d0a6c389d 100644 (file)
--- a/src/generic/hyperlink.cpp
+++ b/src/generic/hyperlink.cpp
@@ -37,10 +37,10 @@
     #include "wx/dcclient.h"
     #include "wx/menu.h"
     #include "wx/log.h"
+    #include "wx/dataobj.h"
 #endif
 
 #include "wx/clipbrd.h"
-#include "wx/dataobj.h"
 
 // ============================================================================
 // implementation

diff --git a/src/gtk/clipbrd.cpp b/src/gtk/clipbrd.cpp
index 92cc30b09076bb2cfd487c0d5aefa0676f48160c..4444320855af76db02dd7cc4b83727ff325b316c 100644 (file)
--- a/src/gtk/clipbrd.cpp
+++ b/src/gtk/clipbrd.cpp
@@ -17,10 +17,9 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/utils.h"
+    #include "wx/dataobj.h"
 #endif
 
-#include "wx/dataobj.h"
-
 #include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------

diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp
index 4a09a5006f6b48d082f63a30fb2f70bea4aca97e..7f02601153e3320c0310d08d3aab181c846d069a 100644 (file)
--- a/src/gtk1/clipbrd.cpp
+++ b/src/gtk1/clipbrd.cpp
@@ -17,10 +17,9 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/utils.h"
+    #include "wx/dataobj.h"
 #endif
 
-#include "wx/dataobj.h"
-
 #include <glib.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 826db3742d61ad16ba622422dbd7cde2ded99ec9..aee43219c08bcc6c23671a131c9890954e8aa6cd 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -24,12 +24,12 @@
     #include "wx/dcmemory.h"
     #include "wx/timer.h"
     #include "wx/settings.h"
+    #include "wx/dataobj.h"
 #endif
 
 #include "wx/html/htmlwin.h"
 #include "wx/html/htmlproc.h"
 #include "wx/clipbrd.h"
-#include "wx/dataobj.h"
 
 #include "wx/arrimpl.cpp"
 #include "wx/listimpl.cpp"

diff --git a/src/mac/classic/dataobj.cpp b/src/mac/classic/dataobj.cpp
index 3ba0b99de71c9bb41c6ad6a6d86de77a9f4712d4..3575f7e745613c6f16159124ce15705adea305d0 100644 (file)
--- a/src/mac/classic/dataobj.cpp
+++ b/src/mac/classic/dataobj.cpp
@@ -23,13 +23,14 @@
 // headers
 // ----------------------------------------------------------------------------
 
+#include "wx/dataobj.h"
+
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/image.h"
 #endif
 
-#include "wx/dataobj.h"
 #include "wx/mstream.h"
 #include "wx/mac/private.h"
 #include <Scrap.h>

diff --git a/src/motif/clipbrd.cpp b/src/motif/clipbrd.cpp
index 7a5763a69b26d9c2c6c15859ec1b7cdd8a98508a..6a54882d931ed6bdd18114b346ddd8fed2a674f1 100644 (file)
--- a/src/motif/clipbrd.cpp
+++ b/src/motif/clipbrd.cpp
@@ -29,9 +29,9 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/bitmap.h"
+    #include "wx/dataobj.h"
 #endif
 
-#include "wx/dataobj.h"
 #include "wx/ptr_scpd.h"
 
 #ifdef __VMS__

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index 59d6f2fcb0dc75c1afe34c553c69ccf7b0411ce4..ee67b677fd694f50b2c6e0ebe782bf4223d27574 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -37,6 +37,7 @@
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/dataobj.h"
 #endif
 
 #if wxUSE_METAFILE
@@ -57,10 +58,6 @@
 // the functions using wxDataObject in wxClipboard
 //#define wxUSE_DATAOBJ wxUSE_DRAG_AND_DROP
 
-#if wxUSE_DATAOBJ
-    #include "wx/dataobj.h"
-#endif
-
 #if wxUSE_OLE && !defined(__WXWINCE__)
     // use OLE clipboard
     #define wxUSE_OLE_CLIPBOARD 1

diff --git a/src/os2/clipbrd.cpp b/src/os2/clipbrd.cpp
index 5c05cdc294196c3eb2451a6ffdfd28438f24f6a7..e4bd46af6fcbef769772e3204d55be531a694455 100644 (file)
--- a/src/os2/clipbrd.cpp
+++ b/src/os2/clipbrd.cpp
@@ -25,6 +25,7 @@
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/dataobj.h"
 #endif
 
 #if wxUSE_METAFILE
@@ -37,11 +38,6 @@
 
 // wxDataObject is tied to OLE/drag and drop implementation,
 // therefore so is wxClipboard :-(
-#if wxUSE_DRAG_AND_DROP
-    #include "wx/dataobj.h"
-
-//    static bool wxSetClipboardData(wxDataObject *data);
-#endif
 
 // ===========================================================================
 // implementation

diff --git a/src/os2/dataobj.cpp b/src/os2/dataobj.cpp
index c07595d1561cced39a15f7ace38fcda5da64cb5e..8ec854054c90e88e986a306b514655c61af2ba70 100644 (file)
--- a/src/os2/dataobj.cpp
+++ b/src/os2/dataobj.cpp
@@ -22,13 +22,14 @@
 
 #if wxUSE_DATAOBJ
 
+#include "wx/dataobj.h"
+
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/image.h"
 #endif
 
-#include "wx/dataobj.h"
 #include "wx/mstream.h"
 
 #include "wx/os2/private.h"

diff --git a/src/palmos/clipbrd.cpp b/src/palmos/clipbrd.cpp
index a60d984fd14f27a6c59a34757af5ed39d634bc39..49877140262c19441f79df01e03d9a46b5cd22ad 100644 (file)
--- a/src/palmos/clipbrd.cpp
+++ b/src/palmos/clipbrd.cpp
@@ -37,6 +37,7 @@
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/dataobj.h"
 #endif
 
 #if wxUSE_METAFILE
@@ -48,11 +49,7 @@
 #include "wx/palmos/private.h"
 
 #if wxUSE_WXDIB
-#include "wx/palmos/dib.h"
-#endif
-
-#if wxUSE_DATAOBJ
-    #include "wx/dataobj.h"
+    #include "wx/palmos/dib.h"
 #endif
 
 #if wxUSE_OLE && !defined(__WXWINCE__)
@@ -75,7 +72,7 @@
 // old-style clipboard functions
 // ---------------------------------------------------------------------------
 
-static bool gs_wxClipboardIsOpen = FALSE;
+static bool gs_wxClipboardIsOpen = false;
 
 bool wxOpenClipboard()
 {
@@ -142,8 +139,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
 
 wxClipboard::wxClipboard()
 {
-    m_clearOnExit = FALSE;
-    m_isOpened = FALSE;
+    m_clearOnExit = false;
+    m_isOpened = false;
 }
 
 wxClipboard::~wxClipboard()

diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index 85725e4ee82bd0a305eba753382bb1479cec27cb..ee680385d798f18012f01acc191654b7b57a8308 100644 (file)
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -24,11 +24,11 @@
     #include "wx/dc.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/dataobj.h"
 #endif
 
 #include "wx/filename.h"
 #include "wx/clipbrd.h"
-#include "wx/dataobj.h"
 #include "wx/wfstream.h"
 #include "wx/module.h"
 #include "wx/mstream.h"
@@ -908,7 +908,7 @@ wxRichTextRange wxRichTextParagraphLayoutBox::AddParagraphs(const wxString& text
 
     wxRichTextRange range(-1, -1);
     size_t i = 0;
-    size_t len = text.Length();
+    size_t len = text.length();
     wxString line;
     while (i < len)
     {
@@ -2266,7 +2266,7 @@ bool wxRichTextParagraph::InsertText(long pos, const wxString& text)
                                text + textObject->GetText().Mid(posInString);
             textObject->SetText(newText);
 
-            int textLength = text.Length();
+            int textLength = text.length();
 
             textObject->SetRange(wxRichTextRange(textObject->GetRange().GetStart(),
                                                  textObject->GetRange().GetEnd() + textLength));
@@ -2760,7 +2760,7 @@ bool wxRichTextParagraph::FindWrapPosition(const wxRichTextRange& range, wxDC& d
         int spacePos = plainText.Find(wxT(' '), true);
         if (spacePos != wxNOT_FOUND)
         {
-            int positionsFromEndOfString = plainText.Length() - spacePos - 1;
+            int positionsFromEndOfString = plainText.length() - spacePos - 1;
             breakPosition = breakPosition - positionsFromEndOfString;
         }
     }
@@ -3198,7 +3198,7 @@ bool wxRichTextPlainText::GetRangeSize(const wxRichTextRange& range, wxSize& siz
 wxRichTextObject* wxRichTextPlainText::DoSplit(long pos)
 {
     int index = pos - GetRange().GetStart();
-    if (index < 0 || index >= (int) m_text.Length())
+    if (index < 0 || index >= (int) m_text.length())
         return NULL;
 
     wxString firstPart = m_text.Mid(0, index);
@@ -3218,7 +3218,7 @@ wxRichTextObject* wxRichTextPlainText::DoSplit(long pos)
 /// Calculate range
 void wxRichTextPlainText::CalculateRange(long start, long& end)
 {
-    end = start + m_text.Length() - 1;
+    end = start + m_text.length() - 1;
     m_range.SetRange(start, end);
 }
 
@@ -3343,7 +3343,7 @@ bool wxRichTextBuffer::InsertTextWithUndo(long pos, const wxString& text, wxRich
     action->SetPosition(pos);
 
     // Set the range we'll need to delete in Undo
-    action->SetRange(wxRichTextRange(pos, pos + text.Length() - 1));
+    action->SetRange(wxRichTextRange(pos, pos + text.length() - 1));
 
     SubmitAction(action);
 
@@ -5286,7 +5286,7 @@ bool wxRichTextPlainTextHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputSt
     wxString text = buffer->GetText();
     wxCharBuffer buf = text.ToAscii();
 
-    stream.Write((const char*) buf, text.Length());
+    stream.Write((const char*) buf, text.length());
     return true;
 }
 #endif // wxUSE_STREAMS
@@ -5485,7 +5485,7 @@ bool wxRichTextImageBlock::WriteHex(wxOutputStream& stream)
         hex = wxDecToHex(m_data[i]);
         wxCharBuffer buf = hex.ToAscii();
 
-        stream.Write((const char*) buf, hex.Length());
+        stream.Write((const char*) buf, hex.length());
     }
 
     return true;

diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp
index 8de05acfcd5c7801b649278608c888f7ec8f4e52..54c170b068581363b8e42ba026e42662b1b984cf 100644 (file)
--- a/src/univ/textctrl.cpp
+++ b/src/univ/textctrl.cpp
@@ -131,6 +131,7 @@
     #include "wx/log.h"
     #include "wx/dcclient.h"
     #include "wx/validate.h"
+    #include "wx/dataobj.h"
 #endif
 
 #include <ctype.h>
@@ -148,10 +149,6 @@
 
 #include "wx/cmdproc.h"
 
-#if wxUSE_CLIPBOARD
-#include "wx/dataobj.h"
-#endif
-
 // turn extra wxTextCtrl-specific debugging on/off
 #define WXDEBUG_TEXT
 

diff --git a/src/x11/clipbrd.cpp b/src/x11/clipbrd.cpp
index 731d49e6685d1cd7f850851081f576221e28b7fc..1ae753aec7a944efa3805679eac298891fa1c834 100644 (file)
--- a/src/x11/clipbrd.cpp
+++ b/src/x11/clipbrd.cpp
@@ -18,10 +18,9 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/utils.h"
+    #include "wx/dataobj.h"
 #endif
 
-#include "wx/dataobj.h"
-
 #include "wx/x11/private.h"
 
 //-----------------------------------------------------------------------------