From 4ce7b1e43fdf835a77a78765fe73de707b89e85f Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 1 Jun 2006 09:16:06 +0000 Subject: [PATCH] Minor source cleaning. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/clrpickercmn.cpp | 4 ++-- src/common/filepickercmn.cpp | 8 +++----- src/common/fontpickercmn.cpp | 9 ++++----- src/gtk/clrpicker.cpp | 9 ++++----- src/gtk/filepicker.cpp | 8 ++++---- src/gtk/fontpicker.cpp | 9 +++------ src/xrc/xh_clrpicker.cpp | 2 +- src/xrc/xh_dirpicker.cpp | 2 +- src/xrc/xh_filepicker.cpp | 2 +- src/xrc/xh_fontpicker.cpp | 2 +- 10 files changed, 24 insertions(+), 31 deletions(-) diff --git a/src/common/clrpickercmn.cpp b/src/common/clrpickercmn.cpp index 5f208643e5..412eaadc7b 100644 --- a/src/common/clrpickercmn.cpp +++ b/src/common/clrpickercmn.cpp @@ -24,6 +24,8 @@ #pragma hdrstop #endif +#if wxUSE_COLOURPICKERCTRL + #include "wx/clrpicker.h" @@ -32,8 +34,6 @@ // implementation // ============================================================================ -#if wxUSE_COLOURPICKERCTRL - DEFINE_EVENT_TYPE(wxEVT_COMMAND_COLOURPICKER_CHANGED) IMPLEMENT_DYNAMIC_CLASS(wxColourPickerCtrl, wxPickerBase) IMPLEMENT_DYNAMIC_CLASS(wxColourPickerEvent, wxEvent) diff --git a/src/common/filepickercmn.cpp b/src/common/filepickercmn.cpp index 949ee2c8c3..ddd28f6c94 100644 --- a/src/common/filepickercmn.cpp +++ b/src/common/filepickercmn.cpp @@ -24,16 +24,14 @@ #pragma hdrstop #endif -#include "wx/filepicker.h" - +#if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL +#include "wx/filepicker.h" // ============================================================================ // implementation // ============================================================================ -#if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL - DEFINE_EVENT_TYPE(wxEVT_COMMAND_FILEPICKER_CHANGED) DEFINE_EVENT_TYPE(wxEVT_COMMAND_DIRPICKER_CHANGED) IMPLEMENT_DYNAMIC_CLASS(wxFileDirPickerEvent, wxCommandEvent) @@ -51,7 +49,7 @@ bool wxFileDirPickerCtrlBase::CreateBase( wxWindow *parent, wxWindowID id, long style, const wxValidator& validator, const wxString &name ) { - wxASSERT_MSG(path.IsEmpty() || CheckPath(path), wxT("Invalid initial path !")); + wxASSERT_MSG(path.empty() || CheckPath(path), wxT("Invalid initial path !")); if (!wxPickerBase::CreateBase(parent, id, path, pos, size, style, validator, name)) diff --git a/src/common/fontpickercmn.cpp b/src/common/fontpickercmn.cpp index 6b2b4daba0..a3b766e571 100644 --- a/src/common/fontpickercmn.cpp +++ b/src/common/fontpickercmn.cpp @@ -24,17 +24,16 @@ #pragma hdrstop #endif +#if wxUSE_FONTPICKERCTRL + #include "wx/fontpicker.h" #include "wx/fontenum.h" #include "wx/tokenzr.h" - // ============================================================================ // implementation // ============================================================================ -#if wxUSE_FONTPICKERCTRL - DEFINE_EVENT_TYPE(wxEVT_COMMAND_FONTPICKER_CHANGED) IMPLEMENT_DYNAMIC_CLASS(wxFontPickerCtrl, wxPickerBase) IMPLEMENT_DYNAMIC_CLASS(wxFontPickerEvent, wxCommandEvent) @@ -94,9 +93,9 @@ wxFont wxFontPickerCtrl::String2Font(const wxString &s) if (size.ToDouble(&n)) { if (n < 1) - str = str.Left(str.Len() - size.Len()) + wxT("1"); + str = str.Left(str.length() - size.length()) + wxT("1"); else if (n >= m_nMaxPointSize) - str = str.Left(str.Len() - size.Len()) + + str = str.Left(str.length() - size.length()) + wxString::Format(wxT("%d"), m_nMaxPointSize); } diff --git a/src/gtk/clrpicker.cpp b/src/gtk/clrpicker.cpp index f331fe7794..9b5cc89a47 100644 --- a/src/gtk/clrpicker.cpp +++ b/src/gtk/clrpicker.cpp @@ -17,20 +17,19 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/gtk/private.h" +#if wxUSE_COLOURPICKERCTRL && defined(__WXGTK24__) + #include "wx/clrpicker.h" +#include "wx/gtk/private.h" + #include #include - - // ============================================================================ // implementation // ============================================================================ -#if wxUSE_COLOURPICKERCTRL && defined(__WXGTK24__) - //----------------------------------------------------------------------------- // "color-set" //----------------------------------------------------------------------------- diff --git a/src/gtk/filepicker.cpp b/src/gtk/filepicker.cpp index 4370de3f9b..a32f2cc185 100644 --- a/src/gtk/filepicker.cpp +++ b/src/gtk/filepicker.cpp @@ -17,12 +17,14 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/gtk/private.h" +#if wxUSE_FILEPICKERCTRL && defined(__WXGTK26__) + #include "wx/filepicker.h" +#include "wx/gtk/private.h" #if wxUSE_TOOLTIPS -#include "wx/tooltip.h" + #include "wx/tooltip.h" #endif #include @@ -35,8 +37,6 @@ // implementation // ============================================================================ -#if wxUSE_FILEPICKERCTRL && defined(__WXGTK26__) - //----------------------------------------------------------------------------- // wxFileButton //----------------------------------------------------------------------------- diff --git a/src/gtk/fontpicker.cpp b/src/gtk/fontpicker.cpp index 8934897134..5c7f24b383 100644 --- a/src/gtk/fontpicker.cpp +++ b/src/gtk/fontpicker.cpp @@ -17,7 +17,8 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/gtk/private.h" +#if wxUSE_FONTPICKERCTRL && defined(__WXGTK24__) + #include "wx/fontpicker.h" #include "wx/fontutil.h" // for wxNativeFontInfo @@ -26,14 +27,10 @@ #include #include - - // ============================================================================ // implementation // ============================================================================ -#if wxUSE_FONTPICKERCTRL && defined(__WXGTK24__) - //----------------------------------------------------------------------------- // "font-set" //----------------------------------------------------------------------------- @@ -126,4 +123,4 @@ void wxFontButton::UpdateFont() wxGenericFontButton::UpdateFont(); } -#endif // wxUSE_FONTPICKERCTRL +#endif // wxUSE_FONTPICKERCTRL && defined(__WXGTK24__) diff --git a/src/xrc/xh_clrpicker.cpp b/src/xrc/xh_clrpicker.cpp index 2d71b823bb..58afba8f72 100644 --- a/src/xrc/xh_clrpicker.cpp +++ b/src/xrc/xh_clrpicker.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_clrpicker.cpp +// Name: src/xrc/xh_clrpicker.cpp // Purpose: XML resource handler for wxColourPickerCtrl // Author: Francesco Montorsi // Created: 2006-04-17 diff --git a/src/xrc/xh_dirpicker.cpp b/src/xrc/xh_dirpicker.cpp index 510094a54d..cda511e55b 100644 --- a/src/xrc/xh_dirpicker.cpp +++ b/src/xrc/xh_dirpicker.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_clrpicker.cpp +// Name: src/xrc/xh_clrpicker.cpp // Purpose: XML resource handler for wxColourPickerCtrl // Author: Francesco Montorsi // Created: 2006-04-17 diff --git a/src/xrc/xh_filepicker.cpp b/src/xrc/xh_filepicker.cpp index e617aebb2d..c9d6a5c402 100644 --- a/src/xrc/xh_filepicker.cpp +++ b/src/xrc/xh_filepicker.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_clrpicker.cpp +// Name: src/xrc/xh_clrpicker.cpp // Purpose: XML resource handler for wxColourPickerCtrl // Author: Francesco Montorsi // Created: 2006-04-17 diff --git a/src/xrc/xh_fontpicker.cpp b/src/xrc/xh_fontpicker.cpp index 1470369e64..ce84a43494 100644 --- a/src/xrc/xh_fontpicker.cpp +++ b/src/xrc/xh_fontpicker.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_clrpicker.cpp +// Name: src/xrc/xh_clrpicker.cpp // Purpose: XML resource handler for wxColourPickerCtrl // Author: Francesco Montorsi // Created: 2006-04-17 -- 2.49.0