Minor source cleaning.

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

diff --git a/src/common/clrpickercmn.cpp b/src/common/clrpickercmn.cpp
index 5f208643e56fbebcae8a961fce8332f76300f6e2..412eaadc7b80c979cb5ff2b4a55c1199e0d6b1e5 100644 (file)
--- 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 949ee2c8c364358817f9c33a2e92e502b5ba9ca0..ddd28f6c941e17575f247a7853c3345d0e51d2a6 100644 (file)
--- 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 6b2b4daba0b6869166562b84e758e86494f52ce0..a3b766e57126a98347f55efef424d54f77a7b540 100644 (file)
--- 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 f331fe779448c5030029548a8b87f107bf2e18ff..9b5cc89a47f0d53a95e9ee4391fe769af5764c96 100644 (file)
--- 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 <gdk/gdk.h>
 #include <gtk/gtk.h>
 
-
-
 // ============================================================================
 // implementation
 // ============================================================================
 
-#if wxUSE_COLOURPICKERCTRL && defined(__WXGTK24__)
-
 //-----------------------------------------------------------------------------
 // "color-set"
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/filepicker.cpp b/src/gtk/filepicker.cpp
index 4370de3f9b1515f5fac0c5a05601495c08ed8d1d..a32f2cc185d8f816a670085ef240af2173323026 100644 (file)
--- 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 <gdk/gdk.h>
@@ -35,8 +37,6 @@
 // implementation
 // ============================================================================
 
-#if wxUSE_FILEPICKERCTRL && defined(__WXGTK26__)
-
 //-----------------------------------------------------------------------------
 // wxFileButton
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/fontpicker.cpp b/src/gtk/fontpicker.cpp
index 8934897134e20edc3dca34caece95fec88c62e7d..5c7f24b383c00cb0fa7e97801c66013a6c4b47b9 100644 (file)
--- 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 <gdk/gdk.h>
 #include <gtk/gtk.h>
 
-
-
 // ============================================================================
 // 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 2d71b823bb556e689c23cf52e6bfd509840a15af..58afba8f72b7182bd3df74c4de34a16e804a2658 100644 (file)
--- 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 510094a54d5ab42786faff31d663739e50b7248f..cda511e55b6e832f4caadaf4e3211f879d0ce60f 100644 (file)
--- 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 e617aebb2de77a0c04b8346ebc0b2cd7e081c791..c9d6a5c4029d42b45b28a090aea4a87ec1dcd02e 100644 (file)
--- 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 1470369e64b3ddfaea56a7ae3597226ea540a57a..ce84a434944ad819507aa83717f1ed659574c89a 100644 (file)
--- 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