AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2006-07-27 12:57:16 +00:00
parent eab77b5983
commit 28f92d74ee
15 changed files with 31 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/wx.h
View File

@ -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"

5
src/cocoa/dataobj.mm
View File

@ -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()
{

2
src/generic/hyperlink.cpp
View File

@ -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

3
src/gtk/clipbrd.cpp
View File

@ -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"
//-----------------------------------------------------------------------------

3
src/gtk1/clipbrd.cpp
View File

@ -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>

2
src/html/htmlwin.cpp
View File

@ -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"

3
src/mac/classic/dataobj.cpp
View File

@ -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>

2
src/motif/clipbrd.cpp
View File

@ -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__

5
src/msw/clipbrd.cpp
View File

@ -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

6
src/os2/clipbrd.cpp
View File

@ -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

3
src/os2/dataobj.cpp
View File

@ -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"

13
src/palmos/clipbrd.cpp
View File

@ -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()

18
src/richtext/richtextbuffer.cpp
View File

@ -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;

5
src/univ/textctrl.cpp
View File

@ -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

3
src/x11/clipbrd.cpp
View File

@ -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"
//-----------------------------------------------------------------------------