VTK wrapper of vtkRenderWindow for wxPython. Tested on MSW so far.

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

diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp
index 706a6320c94d88836d85366b4024258c5ecb9064..2d64b555fb6dcdcea9a6b70fd9fffff97cf24e33 100644 (file)
--- a/src/generic/dirdlgg.cpp
+++ b/src/generic/dirdlgg.cpp
@@ -50,6 +50,7 @@
 #undef GetFirstChild
 #endif
 
 #undef GetFirstChild
 #endif
 

+#ifndef __WXMSW__

 /* XPM */
 static char * icon1_xpm[] = {
 /* width height ncolors chars_per_pixel */
 /* XPM */
 static char * icon1_xpm[] = {
 /* width height ncolors chars_per_pixel */


@@ -108,6 +109,8 @@ static char * icon2_xpm[] = {
 "                ",
 "                "};
 
 "                ",
 "                "};
 

+#endif // !wxMSW
+

 static const int ID_DIRCTRL = 1000;
 static const int ID_TEXTCTRL = 1001;
 static const int ID_OK = 1002;
 static const int ID_DIRCTRL = 1000;
 static const int ID_TEXTCTRL = 1001;
 static const int ID_OK = 1002;


@@ -310,7 +313,11 @@ void wxDirCtrl::OnExpandItem(wxTreeEvent &event)
 
     m_paths.Clear();
     m_names.Clear();
 
     m_paths.Clear();
     m_names.Clear();

+#ifdef __WXMSW__
+    search = data->m_path + "\\*.*";
+#else

     search = data->m_path + "/*";
     search = data->m_path + "/*";

+#endif

     for (path = wxFindFirstFile( search, wxDIR ); !path.IsNull();
        path=wxFindNextFile() )
     {
     for (path = wxFindFirstFile( search, wxDIR ); !path.IsNull();
        path=wxFindNextFile() )
     {


@@ -513,7 +520,7 @@ void wxDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) )
   do {
             new_name = wxT("NewName");
       wxString num;
   do {
             new_name = wxT("NewName");
       wxString num;

-      num.Printf( "%d", i );
+      num.Printf( wxT("%d"), i );

       new_name += num;
 
             path = data->m_path;
       new_name += num;
 
             path = data->m_path;