renamed RGBColor setter to avoid former overload being an override

[wxWidgets.git] / src / generic / dirctrlg.cpp

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index b631aa69cd16e88d791066064466ce864fd66a38..a29d5809e4d7ac3f5a05fc0bace62253c3dbfc64 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -13,12 +13,19 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_DIRDLG || wxUSE_FILEDLG
 
 #include "wx/generic/dirctrlg.h"
 #endif
 
 #if wxUSE_DIRDLG || wxUSE_FILEDLG
 
 #include "wx/generic/dirctrlg.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/hash.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif
+

 #include "wx/module.h"
 #include "wx/utils.h"
 #include "wx/button.h"
 #include "wx/module.h"
 #include "wx/utils.h"
 #include "wx/button.h"


@@ -29,16 +36,13 @@
 #include "wx/filefn.h"
 #include "wx/cmndata.h"
 #include "wx/gdicmn.h"
 #include "wx/filefn.h"
 #include "wx/cmndata.h"
 #include "wx/gdicmn.h"

-#include "wx/intl.h"

 #include "wx/imaglist.h"
 #include "wx/icon.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"
 #include "wx/settings.h"
 #include "wx/artprov.h"
 #include "wx/sizer.h"
 #include "wx/tokenzr.h"
 #include "wx/dir.h"
 #include "wx/settings.h"
 #include "wx/artprov.h"

-#include "wx/hash.h"

 #include "wx/mimetype.h"
 #include "wx/image.h"
 #include "wx/choice.h"
 #include "wx/mimetype.h"
 #include "wx/image.h"
 #include "wx/choice.h"


@@ -48,7 +52,7 @@
 #endif
 
 #if defined(__WXMAC__)
 #endif
 
 #if defined(__WXMAC__)

-  #include  "wx/mac/private.h"  // includes mac headers
+    #include  "wx/mac/private.h"  // includes mac headers

 #endif
 
 #ifdef __WXMSW__
 #endif
 
 #ifdef __WXMSW__


@@ -60,10 +64,10 @@
 //         accordingly.
 #if !defined(__GNUWIN32__) || (defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)
 #if !defined(__WXWINCE__)
 //         accordingly.
 #if !defined(__GNUWIN32__) || (defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)
 #if !defined(__WXWINCE__)

-  #include <direct.h>
+    #include <direct.h>

 #endif
 #endif

-  #include <stdlib.h>
-  #include <ctype.h>
+    #include <stdlib.h>
+    #include <ctype.h>

 #endif
 
 #endif
 #endif
 
 #endif


@@ -82,11 +86,11 @@
 #endif // __OS2__
 
 #if defined(__WXMAC__)
 #endif // __OS2__
 
 #if defined(__WXMAC__)

-# include "MoreFilesX.h"
+    #include "MoreFilesX.h"

 #endif
 
 #ifdef __BORLANDC__
 #endif
 
 #ifdef __BORLANDC__

-#include "dos.h"
+    #include "dos.h"

 #endif
 
 // If compiled under Windows, this macro can cause problems
 #endif
 
 // If compiled under Windows, this macro can cause problems