Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-26 01:28:38 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Include wx/log.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@38920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-04-26 08:21:31 +00:00
parent 56b6cf265c
commit e4db172a3b
220 changed files with 1194 additions and 901 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cocoa/combobox.mm
+1 -1
View File
@@ -80,6 +80,7 @@
#ifndef WX_PRECOMP
#include "wx/window.h"
#include "wx/log.h"
#endif // WX_PRECOMP
#include "wx/cocoa/ObjcPose.h"
@@ -160,7 +161,6 @@ void wxCocoaNSComboBox::DisassociateNSComboBox(WX_NSComboBox cocoaNSComboBox)
#include "wx/app.h"
#include "wx/combobox.h"
#include "wx/log.h"
#include "wx/cocoa/autorelease.h"
#include "wx/cocoa/string.h"
src/common/bmpbase.cpp
+6 -2
View File
@@ -21,11 +21,15 @@
defined(__WXMOTIF__) || \
defined(__WXX11__)
#include "wx/bitmap.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#endif // WX_PRECOMP
#include "wx/utils.h"
#include "wx/palette.h"
#include "wx/bitmap.h"
#include "wx/icon.h"
#include "wx/log.h"
#include "wx/image.h"
#include "wx/module.h"
src/common/cmndata.cpp
+4 -3
View File
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: cmndata.cpp
// Name: src/common/cmndata.cpp
// Purpose: Common GDI data
// Author: Julian Smart
// Modified by:
@@ -24,16 +24,17 @@
#pragma hdrstop
#endif
#include "wx/cmndata.h"
#ifndef WX_PRECOMP
#include <stdio.h>
#include "wx/string.h"
#include "wx/utils.h"
#include "wx/app.h"
#include "wx/log.h"
#endif
#include "wx/gdicmn.h"
#include "wx/cmndata.h"
#include "wx/log.h"
#include "wx/prntbase.h"
#include "wx/printdlg.h"
src/common/colourcmn.cpp
+4 -2
View File
@@ -19,9 +19,11 @@
#include "wx/colour.h"
#include "wx/gdicmn.h"
#include "wx/log.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#endif
#include "wx/gdicmn.h"
// ============================================================================
src/common/config.cpp
+1 -1
View File
@@ -28,9 +28,9 @@
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/log.h"
#endif //WX_PRECOMP
#include "wx/log.h"
#include "wx/arrstr.h"
#if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE)
src/common/dynlib.cpp
+8 -4
View File
@@ -24,15 +24,19 @@
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#if wxUSE_DYNLIB_CLASS
#include "wx/dynlib.h"
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/log.h"
#endif //WX_PRECOMP
#include "wx/filefn.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/utils.h"
#include "wx/filename.h" // for SplitPath()
#include "wx/app.h"
@@ -245,7 +249,7 @@ wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name,
{
wxAppTraits *traits = wxAppConsole::GetInstance() ?
wxAppConsole::GetInstance()->GetTraits() : NULL;
wxCHECK_MSG( traits, _T(""),
wxCHECK_MSG( traits, wxEmptyString,
_("can't query for GUI plugins name in console applications") );
suffix = traits->GetToolkitInfo().shortName;
}
src/common/fileconf.cpp
+1 -1
View File
@@ -27,11 +27,11 @@
#include "wx/dynarray.h"
#include "wx/string.h"
#include "wx/intl.h"
#include "wx/log.h"
#endif //WX_PRECOMP
#include "wx/app.h"
#include "wx/file.h"
#include "wx/log.h"
#include "wx/textfile.h"
#include "wx/memtext.h"
#include "wx/config.h"
src/common/filefn.cpp
+1 -2
View File
@@ -26,6 +26,7 @@
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/log.h"
#endif
#include "wx/utils.h"
@@ -52,8 +53,6 @@
#include "wx/mac/private.h" // includes mac headers
#endif
#include "wx/log.h"
#ifdef __WINDOWS__
#include "wx/msw/private.h"
#include "wx/msw/mslu.h"
src/common/filesys.cpp
+22 -21
View File
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: filesys.cpp
// Name: src/common/filesys.cpp
// Purpose: wxFileSystem class - interface for opening files
// Author: Vaclav Slavik
// Copyright: (c) 1999 Vaclav Slavik
@@ -10,18 +10,22 @@
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#if wxUSE_FILESYSTEM
#include "wx/filesys.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#endif
#include "wx/wfstream.h"
#include "wx/module.h"
#include "wx/filesys.h"
#include "wx/mimetype.h"
#include "wx/filename.h"
#include "wx/log.h"
//--------------------------------------------------------------------------------
@@ -36,7 +40,7 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
wxString ext, mime;
wxString loc = GetRightLocation(location);
wxChar c;
int l = loc.Length(), l2;
int l = loc.length(), l2;
l2 = l;
for (int i = l-1; i >= 0; i--)
@@ -120,7 +124,7 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
wxString wxFileSystemHandler::GetProtocol(const wxString& location) const
{
wxString s = wxEmptyString;
int i, l = location.Length();
int i, l = location.length();
bool fnd = false;
for (i = l-1; (i >= 0) && ((location[i] != wxT('#')) || (!fnd)); i--) {
@@ -137,7 +141,7 @@ wxString wxFileSystemHandler::GetLeftLocation(const wxString& location) const
int i;
bool fnd = false;
for (i = location.Length()-1; i >= 0; i--) {
for (i = location.length()-1; i >= 0; i--) {
if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = true;
else if (fnd && (location[i] == wxT('#'))) return location.Left(i);
}
@@ -146,7 +150,7 @@ wxString wxFileSystemHandler::GetLeftLocation(const wxString& location) const
wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const
{
int i, l = location.Length();
int i, l = location.length();
int l2 = l + 1;
for (i = l-1;
@@ -163,7 +167,7 @@ wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const
wxString wxFileSystemHandler::GetAnchor(const wxString& location) const
{
wxChar c;
int l = location.Length();
int l = location.length();
for (int i = l-1; i >= 0; i--) {
c = location[i];
@@ -256,7 +260,7 @@ static wxString MakeCorrectPath(const wxString& path)
wxString r;
int i, j, cnt;
cnt = p.Length();
cnt = p.length();
for (i = 0; i < cnt; i++)
if (p.GetChar(i) == wxT('\\')) p.GetWritableChar(i) = wxT('/'); // Want to be windows-safe
@@ -275,7 +279,7 @@ static wxString MakeCorrectPath(const wxString& path)
r << p.GetChar(i);
if (p.GetChar(i) == wxT('/') && p.GetChar(i-1) == wxT('.') && p.GetChar(i-2) == wxT('.'))
{
for (j = r.Length() - 2; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {}
for (j = r.length() - 2; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {}
if (j >= 0 && r.GetChar(j) != wxT(':'))
{
for (j = j - 1; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {}
@@ -298,13 +302,13 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
if (is_dir)
{
if (m_Path.Length() > 0 && m_Path.Last() != wxT('/') && m_Path.Last() != wxT(':'))
if (m_Path.length() > 0 && m_Path.Last() != wxT('/') && m_Path.Last() != wxT(':'))
m_Path << wxT('/');
}
else
{
for (i = m_Path.Length()-1; i >= 0; i--)
for (i = m_Path.length()-1; i >= 0; i--)
{
if (m_Path[(unsigned int) i] == wxT('/'))
{
@@ -326,7 +330,7 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
}
if (pathpos == -1)
{
for (i = 0; i < (int) m_Path.Length(); i++)
for (i = 0; i < (int) m_Path.length(); i++)
{
if (m_Path[(unsigned int) i] == wxT(':'))
{
@@ -334,7 +338,7 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
break;
}
}
if (i == (int) m_Path.Length())
if (i == (int) m_Path.length())
m_Path = wxEmptyString;
}
else
@@ -354,7 +358,7 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
wxFSFile *s = NULL;
wxList::compatibility_iterator node;
ln = loc.Length();
ln = loc.length();
meta = 0;
for (i = 0; i < ln; i++)
{
@@ -411,7 +415,7 @@ wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
m_FindFileHandler = NULL;
for (int i = spec2.Length()-1; i >= 0; i--)
for (int i = spec2.length()-1; i >= 0; i--)
if (spec2[(unsigned int) i] == wxT('\\')) spec2.GetWritableChar(i) = wxT('/'); // Want to be windows-safe
node = m_Handlers.GetFirst();
@@ -491,7 +495,7 @@ wxFileName wxFileSystem::URLToFileName(const wxString& url)
}
else if ( (url.Find(wxT("file://")) == 0) &&
(path.Find(wxT('/')) != wxNOT_FOUND) &&
(path.Length() > 1) && (path[1u] != wxT(':')) )
(path.length() > 1) && (path[1u] != wxT(':')) )
{
path = wxT("//") + path;
}
@@ -555,6 +559,3 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
#endif
// wxUSE_FILESYSTEM
src/common/gdicmn.cpp
+6 -2
View File
@@ -20,8 +20,13 @@
#pragma hdrstop
#endif
#include "wx/event.h"
#include "wx/gdicmn.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#endif
#include "wx/event.h"
#include "wx/brush.h"
#include "wx/pen.h"
#include "wx/bitmap.h"
@@ -35,7 +40,6 @@
#include "wx/settings.h"
#include "wx/hashmap.h"
#include "wx/log.h"
#include <string.h>
#ifdef __WXMOTIF__
src/common/geometry.cpp
+8 -5
View File
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: common/geometry.cpp
// Name: src/common/geometry.cpp
// Purpose: Common Geometry Classes
// Author: Stefan Csomor
// Modified by:
@@ -12,17 +12,20 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#if wxUSE_GEOMETRY
#include "wx/log.h"
#include "wx/geometry.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#endif
#include <string.h>
#include "wx/geometry.h"
#include "wx/datstrm.h"
//
src/common/imagpnm.cpp
+2 -2
View File
@@ -20,9 +20,9 @@
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/log.h"
#endif
#include "wx/log.h"
#include "wx/txtstrm.h"
//-----------------------------------------------------------------------------
@@ -184,4 +184,4 @@ bool wxPNMHandler::DoCanRead( wxInputStream& stream )
#endif // wxUSE_STREAMS
#endif // wxUSE_PNM
#endif // wxUSE_IMAGE && wxUSE_PNM
src/common/log.cpp
+2 -3
View File
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: log.cpp
// Name: src/common/log.cpp
// Purpose: Assorted wxLogXXX functions, and wxLog (sink for logs)
// Author: Vadim Zeitlin
// Modified by:
@@ -28,6 +28,7 @@
// wxWidgets
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/app.h"
#include "wx/arrstr.h"
#include "wx/intl.h"
@@ -36,7 +37,6 @@
#include "wx/apptrait.h"
#include "wx/file.h"
#include "wx/log.h"
#include "wx/msgout.h"
#include "wx/textfile.h"
#include "wx/thread.h"
@@ -833,4 +833,3 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
}
#endif // wxUSE_LOG
src/common/memory.cpp
+3 -3
View File
@@ -18,17 +18,19 @@
#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
#include "wx/memory.h"
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/app.h"
#include "wx/hash.h"
#include "wx/log.h"
#endif
#if wxUSE_THREADS
#include "wx/thread.h"
#endif
#include "wx/log.h"
#include <stdlib.h>
#include "wx/ioswrap.h"
@@ -54,8 +56,6 @@
#endif
#include "wx/memory.h"
#if wxUSE_THREADS && defined(__WXDEBUG__)
#define USE_THREADSAFE_MEMORY_ALLOCATION 1
#else
src/common/mimecmn.cpp
+1 -1
View File
@@ -33,10 +33,10 @@
#include "wx/dynarray.h"
#include "wx/string.h"
#include "wx/intl.h"
#include "wx/log.h"
#endif //WX_PRECOMP
#include "wx/module.h"
#include "wx/log.h"
#include "wx/file.h"
#include "wx/iconloc.h"
#include "wx/confbase.h"
src/common/module.cpp
+1 -1
View File
@@ -21,9 +21,9 @@
#ifndef WX_PRECOMP
#include "wx/hash.h"
#include "wx/intl.h"
#include "wx/log.h"
#endif
#include "wx/log.h"
#include "wx/listimpl.cpp"
#define TRACE_MODULE _T("module")
src/common/msgout.cpp
+2 -4
View File
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: common/msgout.cpp
// Name: src/common/msgout.cpp
// Purpose: wxMessageOutput implementation
// Author: Mattia Barbon
// Modified by:
@@ -29,6 +29,7 @@
#include "wx/ffile.h"
#include "wx/app.h"
#include "wx/intl.h"
#include "wx/log.h"
#if wxUSE_GUI
#include "wx/msgdlg.h"
#endif // wxUSE_GUI
@@ -36,8 +37,6 @@
#include "wx/msgout.h"
#include "wx/apptrait.h"
#include "wx/log.h"
#include <stdarg.h>
#include <stdio.h>
@@ -221,4 +220,3 @@ void wxMessageOutputMessageBox::Printf(const wxChar* format, ...)
}
#endif // wxUSE_GUI
src/common/socket.cpp
+1 -1
View File
@@ -28,6 +28,7 @@
#include "wx/object.h"
#include "wx/string.h"
#include "wx/intl.h"
#include "wx/log.h"
#endif
#include "wx/app.h"
@@ -35,7 +36,6 @@
#include "wx/timer.h"
#include "wx/utils.h"
#include "wx/module.h"
#include "wx/log.h"
#include "wx/event.h"
#include "wx/sckaddr.h"
src/common/zstream.cpp
+1 -1
View File
@@ -22,10 +22,10 @@
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/log.h"
#endif
#include "wx/utils.h"
#include "wx/log.h"
// normally, the compiler options should contain -I../zlib, but it is
// apparently not the case for all MSW makefiles and so, unless we use
src/generic/buttonbar.cpp
+11 -11
View File
@@ -6,7 +6,7 @@
// Created: 2006-04-13
// Id: $Id$
// Copyright: (c) Julian Smart, Robert Roebling, Vadim Zeitlin,
// SciTech Software, Inc.
// SciTech Software, Inc.
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -28,15 +28,16 @@
// Currently, only for Mac as a toolbar replacement.
#if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON
#include "wx/generic/buttonbar.h"
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/app.h"
#include "wx/log.h"
#endif
#include "wx/generic/buttonbar.h"
#include "wx/frame.h"
#include "wx/image.h"
#include "wx/log.h"
#include "wx/settings.h"
#include "wx/dcclient.h"
@@ -62,7 +63,7 @@ public:
m_x = m_y = wxDefaultCoord;
m_width =
m_height = 0;
m_button = NULL;
}
@@ -118,7 +119,7 @@ void wxButtonToolBar::Init()
m_labelMargin = 2;
m_labelHeight = 0;
SetMargins(8, 2);
SetToolPacking(8);
}
@@ -347,10 +348,10 @@ bool wxButtonToolBar::Realize()
{
if ( !wxToolBarBase::Realize() )
return false;
m_needsLayout = true;
DoLayout();
SetBestSize(wxSize(m_maxWidth, m_maxHeight));
return true;
@@ -378,7 +379,7 @@ void wxButtonToolBar::DoLayout()
tool->m_x = x;
tool->m_y = y;
if (tool->IsButton())
{
if (!tool->GetButton())
@@ -387,14 +388,14 @@ void wxButtonToolBar::DoLayout()
wxBU_AUTODRAW|wxBORDER_NONE);
if (!tool->GetShortHelp().IsEmpty())
bmpButton->SetLabel(tool->GetShortHelp());
tool->SetButton(bmpButton);
}
else
{
tool->GetButton()->Move(wxPoint(tool->m_x, tool->m_y));
}
int w = widthTool;
if (tool->GetButton())
{
@@ -553,4 +554,3 @@ void wxButtonToolBar::OnLeftUp(wxMouseEvent& event)
}
#endif // wxUSE_TOOLBAR && wxUSE_BMPBUTTON
src/generic/dcpsg.cpp
+1 -1
View File
@@ -21,13 +21,13 @@
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/log.h"
#endif // WX_PRECOMP
#include "wx/dcmemory.h"
#include "wx/utils.h"
#include "wx/app.h"
#include "wx/image.h"
#include "wx/log.h"
#include "wx/prntbase.h"
#include "wx/generic/prntdlgg.h"
#include "wx/paper.h"
src/generic/dirctrlg.cpp
+1 -1
View File
@@ -23,6 +23,7 @@
#ifndef WX_PRECOMP
#include "wx/hash.h"
#include "wx/intl.h"
#include "wx/log.h"
#endif
#include "wx/module.h"
@@ -37,7 +38,6 @@
#include "wx/gdicmn.h"
#include "wx/imaglist.h"
#include "wx/icon.h"
#include "wx/log.h"
#include "wx/sizer.h"
#include "wx/tokenzr.h"
#include "wx/dir.h"
src/generic/dragimgg.cpp
+1 -2
View File
@@ -35,10 +35,9 @@
#include "wx/dcmemory.h"
#include "wx/settings.h"
#include "wx/intl.h"
#include "wx/log.h"
#endif
#include "wx/log.h"
#define wxUSE_IMAGE_IN_DRAGIMAGE 1
#if wxUSE_IMAGE_IN_DRAGIMAGE
src/generic/mdig.cpp
+3 -3
View File
@@ -24,13 +24,15 @@
#pragma hdrstop
#endif
#include "wx/generic/mdig.h"
#ifndef WX_PRECOMP
#include "wx/panel.h"
#include "wx/menu.h"
#include "wx/intl.h"
#include "wx/log.h"
#endif //WX_PRECOMP
#include "wx/generic/mdig.h"
#include "wx/stockitem.h"
enum MDI_MENU_ID
@@ -399,7 +401,6 @@ wxGenericMDIChildFrame::wxGenericMDIChildFrame( wxGenericMDIParentFrame *parent,
Create( parent, id, title, wxDefaultPosition, size, style, name );
}
#include "wx/log.h"
wxGenericMDIChildFrame::~wxGenericMDIChildFrame()
{
wxGenericMDIParentFrame *pParentFrame = GetMDIParentFrame();
@@ -812,4 +813,3 @@ IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxGenericMDIChildFrame)
IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxGenericMDIClientWindow)
#endif
src/generic/notebook.cpp
+1 -1
View File
@@ -30,9 +30,9 @@
#ifndef WX_PRECOMP
#include "wx/string.h"
#include "wx/log.h"
#endif
#include "wx/log.h"
#include "wx/settings.h"
#include "wx/generic/imaglist.h"
#include "wx/dcclient.h"
src/generic/timer.cpp
+7 -4
View File
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: mgl/timer.cpp
// Name: src/generic/timer.cpp
// Purpose: wxTimer implementation
// Author: Vaclav Slavik
// Id: $Id$
@@ -20,11 +20,14 @@
// is in wxEventLoop::Dispatch().
// ----------------------------------------------------------------------------
#include "wx/timer.h"
#if wxUSE_TIMER
#include "wx/log.h"
#include "wx/timer.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#endif
#include "wx/module.h"
// ----------------------------------------------------------------------------
src/gtk/app.cpp
+6 -6
View File
@@ -20,11 +20,11 @@
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/log.h"
#endif
#include "wx/gdicmn.h"
#include "wx/utils.h"
#include "wx/log.h"
#include "wx/memory.h"
#include "wx/font.h"
#include "wx/settings.h"
@@ -257,7 +257,7 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
#if wxUSE_THREADS
wxMutexLocker lock(gs_idleTagsMutex);
#endif
g_isIdle = TRUE;
g_isIdle = true;
wxTheApp->m_idleTag = 0;
}
@@ -348,7 +348,7 @@ static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
gdk_threads_enter();
wxMutexGuiLeave();
g_mainThreadLocked = TRUE;
g_mainThreadLocked = true;
// we rely on the fact that glib GPollFD struct is really just pollfd but
// I wonder how wise is this in the long term (VZ)
@@ -428,7 +428,7 @@ wxApp::wxApp()
#endif // __WXDEBUG__
m_idleTag = 0;
g_isIdle = TRUE;
g_isIdle = true;
wxapp_install_idle_handler();
#if wxUSE_THREADS
@@ -664,7 +664,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
return false;
}
wxSetDetectableAutoRepeat( TRUE );
wxSetDetectableAutoRepeat( true );
#if wxUSE_INTL
wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
@@ -702,6 +702,6 @@ void wxApp::RemoveIdleTag()
{
g_source_remove( wxTheApp->m_idleTag );
wxTheApp->m_idleTag = 0;
g_isIdle = TRUE;
g_isIdle = true;
}
}
src/gtk/clipbrd.cpp
+15 -19
View File
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: gtk/clipbrd.cpp
// Name: src/gtk/clipbrd.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@ -10,23 +10,19 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_CLIPBOARD
#include "wx/clipbrd.h"
#if wxUSE_CLIPBOARD
#ifndef WX_PRECOMP
#include "wx/log.h"
#endif
#include "wx/dataobj.h"
#include "wx/utils.h"
#include "wx/log.h"
#include "wx/gtk/private.h"
//-----------------------------------------------------------------------------
// thread system
//-----------------------------------------------------------------------------
#if wxUSE_THREADS
#endif
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
@@ -120,8 +116,8 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
if (format == clipboard->m_targetRequested)
{
clipboard->m_waiting = FALSE;
clipboard->m_formatSupported = TRUE;
clipboard->m_waiting = false;
clipboard->m_formatSupported = true;
return;
}
}
@@ -184,7 +180,7 @@ selection_received( GtkWidget *WXUNUSED(widget),
data_object->SetData( format, (size_t) selection_data->length, (const char*) selection_data->data );
wxTheClipboard->m_formatSupported = TRUE;
wxTheClipboard->m_formatSupported = true;
clipboard->m_waiting = FALSE;
}
}
@@ -197,20 +193,20 @@ extern "C" {
static gint
selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
{
if (!wxTheClipboard) return TRUE;
if (!wxTheClipboard) return true;
if (event->selection == GDK_SELECTION_PRIMARY)
{
wxTheClipboard->m_ownsPrimarySelection = FALSE;
wxTheClipboard->m_ownsPrimarySelection = false;
}
else
if (event->selection == g_clipboardAtom)
{
wxTheClipboard->m_ownsClipboard = FALSE;
wxTheClipboard->m_ownsClipboard = false;
}
else
{
wxTheClipboard->m_waiting = FALSE;
wxTheClipboard->m_waiting = false;
return FALSE;
}
@@ -227,7 +223,7 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
}
}
wxTheClipboard->m_waiting = FALSE;
wxTheClipboard->m_waiting = false;
return TRUE;
}
}
@@ -382,7 +378,7 @@ void wxClipboard::Clear()
// it, clear_selection is called which will set m_data to zero
if (gdk_selection_owner_get( g_clipboardAtom ) == m_clipboardWidget->window)
{
m_waiting = TRUE;
m_waiting = true;
gtk_selection_owner_set( (GtkWidget*) NULL, g_clipboardAtom,
(guint32) GDK_CURRENT_TIME );
src/gtk/control.cpp
+6 -3
View File
@@ -12,8 +12,12 @@
#if wxUSE_CONTROLS
#include "wx/log.h"
#include "wx/control.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#endif
#include "wx/fontutil.h"
#include "wx/settings.h"
#include "wx/gtk/private.h"
@@ -126,7 +130,7 @@ GtkWidget* wxControl::GTKCreateFrame(const wxString& label)
GtkWidget* framewidget = gtk_frame_new(NULL);
gtk_frame_set_label_widget(GTK_FRAME(framewidget), labelwidget);
return framewidget; //note that the label is already set so you'll
return framewidget; //note that the label is already set so you'll
//only need to call wxControl::SetLabel afterwards
}
@@ -363,4 +367,3 @@ wxControl::GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t widget_new,
}
#endif // wxUSE_CONTROLS
src/gtk/dataobj.cpp
+6 -3
View File
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
// Name: dataobj.cpp
// Name: src/gtk/dataobj.cpp
// Purpose: wxDataObject class
// Author: Robert Roebling
// Id: $Id$
@@ -10,15 +10,18 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_DATAOBJ
#include "wx/dataobj.h"
#if wxUSE_DATAOBJ
#ifndef WX_PRECOMP
#include "wx/log.h"
#endif
#include "wx/app.h"
#include "wx/debug.h"
#include "wx/mstream.h"
#include "wx/image.h"
#include "wx/log.h"
#include "wx/uri.h"
#include <gdk/gdk.h>
src/gtk/dataview.cpp
+7 -4
View File
@@ -16,12 +16,15 @@
#ifndef wxUSE_GENERICDATAVIEWCTRL
#ifndef WX_PRECOMP
#include "wx/log.h"
#endif
#include "wx/stockitem.h"
#include "wx/dcclient.h"
#include "wx/calctrl.h"
#include "wx/popupwin.h"
#include "wx/sizer.h"
#include "wx/log.h"
#include "wx/gtk/private.h"
#include "wx/gtk/win_gtk.h"
@@ -1349,17 +1352,17 @@ wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewCell *cell,
GtkTreeViewColumn *column = gtk_tree_view_column_new();
gtk_tree_view_column_set_title( column, wxGTK_CONV(title) );
if (sizing == wxDATAVIEW_COL_WIDTH_FIXED)
gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_FIXED );
else if (sizing == wxDATAVIEW_COL_WIDTH_GROW)
gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_GROW_ONLY );
else
gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_AUTOSIZE );
if (fixed_width > 0)
gtk_tree_view_column_set_fixed_width( column, fixed_width );
gtk_tree_view_column_pack_start( column, renderer, TRUE );
gtk_tree_view_column_set_cell_data_func( column, renderer,
src/gtk/dcclient.cpp
+6 -2
View File
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: gtk/dcclient.cpp
// Name: src/gtk/dcclient.cpp
// Purpose:
// Author: Robert Roebling
// RCS-ID: $Id$
@@ -15,10 +15,14 @@
#endif
#include "wx/dcclient.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#endif
#include "wx/dcmemory.h"
#include "wx/image.h"
#include "wx/module.h"
#include "wx/log.h"
#include "wx/fontutil.h"
#include "wx/gtk/win_gtk.h"
src/gtk/dnd.cpp
+1 -1
View File
@@ -16,12 +16,12 @@
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/log.h"
#endif
#include "wx/window.h"
#include "wx/app.h"
#include "wx/gdicmn.h"
#include "wx/log.h"
#include "wx/utils.h"
#include "wx/gtk/private.h"
src/gtk/font.cpp
+7 -3
View File
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: gtk/font.cpp
// Name: src/gtk/font.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@ -19,10 +19,14 @@
#include "wx/wxprec.h"
#include "wx/font.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#endif
#include "wx/fontutil.h"
#include "wx/cmndata.h"
#include "wx/utils.h"
#include "wx/log.h"
#include "wx/gdicmn.h"
#include "wx/tokenzr.h"
#include "wx/settings.h"
@@ -424,7 +428,7 @@ int wxFont::GetPointSize() const
wxString wxFont::GetFaceName() const
{
wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
#if wxUSE_PANGO
return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetFaceName()
src/gtk/gnome/gprint.cpp
+13 -10
View File
@@ -19,13 +19,16 @@
#if wxUSE_LIBGNOMEPRINT
#ifndef WX_PRECOMP
#include "wx/log.h"
#endif
#include "wx/math.h"
#include "wx/fontutil.h"
#include "wx/gtk/private.h"
#include "wx/module.h"
#include "wx/dynlib.h"
#include "wx/dcmemory.h"
#include "wx/log.h"
#include "wx/icon.h"
#include <libgnomeprint/gnome-print.h>
@@ -1160,7 +1163,7 @@ void wxGnomePrintDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width,
}
}
void wxGnomePrintDC::makeEllipticalPath(wxCoord x, wxCoord y,
void wxGnomePrintDC::makeEllipticalPath(wxCoord x, wxCoord y,
wxCoord width, wxCoord height)
{
double r = 4 * (sqrt (2) - 1) / 3;
@@ -1170,22 +1173,22 @@ void wxGnomePrintDC::makeEllipticalPath(wxCoord x, wxCoord y,
halfHR = r * halfH;
wxCoord halfWI = (wxCoord) halfW,
halfHI = (wxCoord) halfH;
gs_lgp->gnome_print_newpath( m_gpc );
// Approximate an ellipse using four cubic splines, clockwise from 0 deg */
gs_lgp->gnome_print_moveto( m_gpc,
XLOG2DEV(x + width),
XLOG2DEV(x + width),
YLOG2DEV(y + halfHI) );
gs_lgp->gnome_print_curveto( m_gpc,
XLOG2DEV(x + width),
YLOG2DEV(y + (wxCoord) rint (halfH + halfHR)),
XLOG2DEV(x + (wxCoord) rint(halfW + halfWR)),
XLOG2DEV(x + (wxCoord) rint(halfW + halfWR)),
YLOG2DEV(y + height),
XLOG2DEV(x + halfWI),
XLOG2DEV(x + halfWI),
YLOG2DEV(y + height) );
gs_lgp->gnome_print_curveto( m_gpc,
XLOG2DEV(x + (wxCoord) rint(halfW - halfWR)),
XLOG2DEV(x + (wxCoord) rint(halfW - halfWR)),
YLOG2DEV(y + height),
XLOG2DEV(x),
YLOG2DEV(y + (wxCoord) rint (halfH + halfHR)),
@@ -1202,7 +1205,7 @@ void wxGnomePrintDC::makeEllipticalPath(wxCoord x, wxCoord y,
XLOG2DEV(x + width),
YLOG2DEV(y + (wxCoord) rint(halfH - halfHR)),
XLOG2DEV(x + width), YLOG2DEV(y + halfHI) );
gs_lgp->gnome_print_closepath(m_gpc);
}
@@ -1534,7 +1537,7 @@ void wxGnomePrintDC::SetPen( const wxPen& pen )
case wxSHORT_DASH: gs_lgp->gnome_print_setdash( m_gpc, 2, short_dashed, 0 ); break;
case wxLONG_DASH: gs_lgp->gnome_print_setdash( m_gpc, 2, wxCoord_dashed, 0 ); break;
case wxDOT_DASH: gs_lgp->gnome_print_setdash( m_gpc, 4, dotted_dashed, 0 ); break;
case wxUSER_DASH:
case wxUSER_DASH:
{
// It may be noted that libgnomeprint between at least
// versions 2.8.0 and 2.12.1 makes a copy of the dashes
src/gtk/gnome/gvfs.cpp
+9 -6
View File
@@ -19,11 +19,14 @@
#if wxUSE_MIMETYPE && wxUSE_LIBGNOMEVFS
#ifndef WX_PRECOMP
#include "wx/log.h"
#endif
#include "wx/mimetype.h"
#include "wx/gtk/private.h"
#include "wx/module.h"
#include "wx/dynlib.h"
#include "wx/log.h"
#include <libgnomevfs/gnome-vfs-mime-handlers.h>
@@ -62,7 +65,7 @@ public:
(), (), FALSE )
wxDL_METHOD_DEFINE( void, gnome_vfs_shutdown,
(), (), /**/ )
wxDL_METHOD_DEFINE( GnomeVFSResult, gnome_vfs_mime_set_icon,
(const char *mime_type, const char *filename), (mime_type, filename), GNOME_VFS_OK )
};
@@ -98,7 +101,7 @@ void wxGnomeVFSLibrary::InitializeMethods()
wxDL_METHOD_LOAD( m_gnome_vfs_lib, gnome_vfs_init, success )
wxDL_METHOD_LOAD( m_gnome_vfs_lib, gnome_vfs_shutdown, success )
m_ok = true;
}
@@ -125,7 +128,7 @@ bool wxGnomeVFSMimeTypesManagerImpl::DoAssociation(const wxString& strType,
const wxString& strDesc)
{
int nIndex = AddToMimeData(strType, strIcon, entry, strExtensions, strDesc, true);
if ( nIndex == wxNOT_FOUND )
return false;
@@ -134,7 +137,7 @@ bool wxGnomeVFSMimeTypesManagerImpl::DoAssociation(const wxString& strType,
// User modificationt to the MIME database
// are not supported :-)
}
return false;
}
@@ -168,7 +171,7 @@ void wxGnomeVFSModule::OnExit()
{
if (gs_lgvfs->IsOk())
gs_lgvfs->gnome_vfs_shutdown();
delete gs_lgvfs;
}
src/gtk/listbox.cpp
+1 -1
View File
@@ -18,13 +18,13 @@
#ifndef WX_PRECOMP
#include "wx/dynarray.h"
#include "wx/intl.h"
#include "wx/log.h"
#endif
#include "wx/arrstr.h"
#include "wx/utils.h"
#include "wx/checklst.h"
#include "wx/settings.h"
#include "wx/log.h"
#include "wx/gtk/private.h"
#include "wx/gtk/treeentry_gtk.h"
src/gtk/menu.cpp
+1 -1
View File
@@ -14,9 +14,9 @@
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/log.h"
#endif
#include "wx/log.h"
#include "wx/app.h"
#include "wx/bitmap.h"
src/gtk/notebook.cpp
+1 -1
View File
@@ -16,12 +16,12 @@
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/log.h"
#endif
#include "wx/panel.h"
#include "wx/utils.h"
#include "wx/imaglist.h"
#include "wx/log.h"
#include "wx/bitmap.h"
#include "wx/fontutil.h"
src/gtk/radiobox.cpp
+4 -1
View File
@@ -14,9 +14,12 @@
#include "wx/radiobox.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#endif
#include "wx/dialog.h"
#include "wx/frame.h"
#include "wx/log.h"
#include "wx/gtk/private.h"
#include <gdk/gdkkeysyms.h>
src/gtk/region.cpp
+5 -3
View File
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: gtk/region.cpp
// Name: src/gtk/region.cpp
// Purpose:
// Author: Robert Roebling
// Modified: VZ at 05.10.00: use AllocExclusive(), comparison fixed
@@ -19,8 +19,11 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#endif
#include "wx/region.h"
#include "wx/log.h"
#include "wx/gtk/private.h"
@@ -524,4 +527,3 @@ wxRect wxRegionIterator::GetRect() const
return r;
}
src/gtk/taskbar.cpp
+6 -2
View File
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// File: taskbar.cpp
// File: src/gtk/taskbar.cpp
// Purpose: wxTaskBarIcon (src/unix/taskbarx11.cpp) helper for GTK2
// Author: Vaclav Slavik
// Modified by:
@@ -13,7 +13,11 @@
#include "wx/wxprec.h"
#include "wx/gtk/taskbarpriv.h"
#include "wx/log.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#endif
#include "wx/frame.h"
#include "wx/menu.h"
src/gtk/textctrl.cpp
+1 -1
View File
@@ -14,10 +14,10 @@
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/log.h"
#endif
#include "wx/utils.h"
#include "wx/log.h"
#include "wx/math.h"
#include "wx/settings.h"
#include "wx/panel.h"
src/gtk/threadno.cpp
+6 -2
View File
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: thread.cpp
// Name: src/gtk/thread.cpp
// Purpose: Solaris thread support
// Author: Guilhem Lavaux
// Modified by:
@@ -13,9 +13,13 @@
#include "wx/wxprec.h"
#include "wx/thread.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#endif
#include "wx/wx.h"
#include "wx/module.h"
#include "wx/log.h"
wxMutex::wxMutex()
{
src/gtk/threadsgi.cpp
+6 -3
View File
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: threadsgi.cpp
// Name: src/gtk/threadsgi.cpp
// Purpose: wxThread (SGI) Implementation
// Author: Original from Wolfram Gloger/Guilhem Lavaux
// Modified by:
@@ -13,6 +13,11 @@
#include "wx/wxprec.h"
#include "wx/thread.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#endif
#include <stdio.h>
#include <unistd.h>
@@ -21,7 +26,6 @@
#include <sys/prctl.h>
#include "wx/module.h"
#include "wx/utils.h"
#include "wx/log.h"
#include "gdk/gdk.h"
#include "gtk/gtk.h"
@@ -266,4 +270,3 @@ void wxThreadModule::OnExit()
wxThreadGuiExit();
delete wxMainMutex;
}
src/gtk/toplevel.cpp
+5 -1
View File
@@ -23,7 +23,11 @@
#endif
#include "wx/toplevel.h"
#include "wx/log.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#endif
#include "wx/dialog.h"
#include "wx/control.h"
#include "wx/app.h"
src/gtk/treegtk.cpp
+12 -11
View File
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: treectrl.cpp
// Name: src/gtk/treectrl.cpp
// Purpose: wxTreeCtrl
// Author: Denis Pershin
// Modified by:
@@ -13,16 +13,16 @@
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#include "wx/wx.h"
#include "wx/wx.h"
#include "wx/log.h"
#endif
#include "wx/gtk/treectrl.h"
#include "wx/textctrl.h"
#include "wx/log.h"
#include <gtk/gtk.h>
@@ -186,16 +186,17 @@ void wxTreeCtrl::SetStateImageList(wxImageList *imageList) {
m_imageListState = imageList;
}
wxString wxTreeCtrl::GetItemText(const wxTreeItemId &item) const {
char *t;
wxString wxTreeCtrl::GetItemText(const wxTreeItemId &item) const
{
char *t;
if (!item.IsOk())
return wxString("");
if (!item.IsOk())
return wxEmptyString;
GtkLabel *l = GTK_LABEL(gtk_object_get_data(GTK_OBJECT((GtkTreeItem *)item), "w_label"));
gtk_label_get(l, &t);
GtkLabel *l = GTK_LABEL(gtk_object_get_data(GTK_OBJECT((GtkTreeItem *)item), "w_label"));
gtk_label_get(l, &t);
return t;
return t;
}
int wxTreeCtrl::GetItemImage(const wxTreeItemId& item) const {
src/gtk/utilsgtk.cpp
+1 -1
View File
@@ -15,10 +15,10 @@
#ifndef WX_PRECOMP
#include "wx/string.h"
#include "wx/intl.h"
#include "wx/log.h"
#endif
#include "wx/apptrait.h"
#include "wx/log.h"
#include "wx/process.h"
src/gtk/utilsres.cpp
+1 -1
View File
@@ -15,9 +15,9 @@
#ifndef WX_PRECOMP
#include "wx/list.h"
#include "wx/string.h"
#include "wx/log.h"
#endif
#include "wx/log.h"
#include "wx/config.h"
#include "wx/app.h"
src/gtk/window.cpp
+1 -1
View File
@@ -18,6 +18,7 @@
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/log.h"
#endif
#include "wx/dcclient.h"
@@ -52,7 +53,6 @@
#include "wx/menu.h"
#include "wx/statusbr.h"
#include "wx/settings.h"
#include "wx/log.h"
#include "wx/fontutil.h"
#ifdef __WXDEBUG__

Some files were not shown because too many files have changed in this diff Show More