Minor source cleaning.

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

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)

src/common/filepickercmn.cpp

@@ -24,16 +24,14 @@
     #pragma hdrstop
 #endif
 
+#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))

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);
     }
 

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

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

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

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

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

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

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