ensure that the copies of the bitmap passed to wxMemoryDC ctor are not modified when...

[wxWidgets.git] / src / xrc / xh_gdctl.cpp

diff --git a/src/xrc/xh_gdctl.cpp b/src/xrc/xh_gdctl.cpp
index 46e1add1830a030ddd84e544497b831e523ba4d6..bbd0a0df59217405a6f6c1215d5a138ecdab2cb6 100644 (file)
--- a/src/xrc/xh_gdctl.cpp
+++ b/src/xrc/xh_gdctl.cpp
@@ -1,17 +1,13 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_gdctl.cpp
+// Name:        src/xrc/xh_gdctl.cpp

 // Purpose:     XRC resource for wxGenericDirCtrl
 // Author:      Markus Greither
 // Created:     2002/01/20
 // Purpose:     XRC resource for wxGenericDirCtrl
 // Author:      Markus Greither
 // Created:     2002/01/20

-// RCS-ID:
+// RCS-ID:      $Id$

 // Copyright:   (c) 2002 Markus Greither
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) 2002 Markus Greither
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "xh_gdctl.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -21,8 +17,12 @@
 
 #if wxUSE_XRC && wxUSE_DIRDLG
 
 
 #if wxUSE_XRC && wxUSE_DIRDLG
 

-#include "wx/textctrl.h"

 #include "wx/xrc/xh_gdctl.h"
 #include "wx/xrc/xh_gdctl.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/textctrl.h"
+#endif
+

 #include "wx/dirctrl.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxGenericDirCtrlXmlHandler, wxXmlResourceHandler)
 #include "wx/dirctrl.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxGenericDirCtrlXmlHandler, wxXmlResourceHandler)


@@ -33,7 +33,7 @@ wxGenericDirCtrlXmlHandler::wxGenericDirCtrlXmlHandler()
     XRC_ADD_STYLE(wxDIRCTRL_DIR_ONLY);
     XRC_ADD_STYLE(wxDIRCTRL_3D_INTERNAL);
     XRC_ADD_STYLE(wxDIRCTRL_SELECT_FIRST);
     XRC_ADD_STYLE(wxDIRCTRL_DIR_ONLY);
     XRC_ADD_STYLE(wxDIRCTRL_3D_INTERNAL);
     XRC_ADD_STYLE(wxDIRCTRL_SELECT_FIRST);

-    XRC_ADD_STYLE(wxDIRCTRL_SHOW_FILTERS);
+    XRC_ADD_STYLE(wxDIRCTRL_EDIT_LABELS);

     AddWindowStyles();
 }
 
     AddWindowStyles();
 }