X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/60d2cc2571b4528aa02d06e80444dc762b41f9f2..2d956b58023a4955313a1c1531bc70a0deb0b831:/src/generic/filedlgg.cpp

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 4f2629a4fa..bc618a2345 100644
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -263,7 +263,7 @@ static wxBitmap CreateAntialiasedBitmap(const wxImage& img)
         p1 += 32 * 3, p2 += 32 * 3;
     }
 
-    return small.ConvertToBitmap();
+    return wxBitmap(small);
 }
 
 // finds empty borders and return non-empty area of image:
@@ -332,12 +332,12 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
         m_HashTable.Put(extension, new wxFileIconEntry(newid));
         return newid;
     }
-    wxImage img(ic);
+    wxImage img = ic.ConvertToImage();
     delete ft;
 
     int id = m_ImageList.GetImageCount();
     if (img.GetWidth() == 16 && img.GetHeight() == 16)
-        m_ImageList.Add(img.ConvertToBitmap());
+        m_ImageList.Add(wxBitmap(img));
     else
     {
         if (img.GetWidth() != 32 || img.GetHeight() != 32)
@@ -1102,10 +1102,16 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
 #endif
     buttonsizer->Add( butNewDir, 0, wxALL, 5 );
 
+#ifdef __WXX11__
+    mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 0 );
+#else
     mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 5 );
+#endif
 
     wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL );
+#ifndef __WXX11__
     staticsizer->Add( new wxStaticText( this, -1, _("Current directory:") ), 0, wxRIGHT, 10 );
+#endif
     m_static = new wxStaticText( this, -1, m_dir );
     staticsizer->Add( m_static, 1 );
     mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 );
@@ -1119,7 +1125,31 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
     m_list->ShowHidden(s_lastShowHidden);
     m_list->SetNewDirControl(butNewDir);
     m_list->SetGoToParentControl(butDirUp);
+
+#ifdef __WXX11__
+    // PDAs have a different screen layout
+    mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
+
+    wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL );
+    m_choice = new wxChoice( this, ID_CHOICE );
+    choicesizer->Add( m_choice, 1, wxCENTER|wxALL, 5 );
+    mainsizer->Add( choicesizer, 0, wxEXPAND );
+    
+    wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
+    m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER );
+    textsizer->Add( m_text, 1, wxCENTER | wxALL, 5 );
+    mainsizer->Add( textsizer, 0, wxEXPAND );
+
+    m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") );
+    m_check->SetValue( s_lastShowHidden );
+    textsizer->Add( m_check, 0, wxCENTER|wxALL, 5 );
     
+    buttonsizer = new wxBoxSizer( wxHORIZONTAL );
+    buttonsizer->Add( new wxButton( this, wxID_OK, _("OK") ), 0, wxCENTER | wxALL, 5 );
+    buttonsizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 5 );
+    mainsizer->Add( buttonsizer, 0, wxALIGN_RIGHT );
+
+#else
     mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
 
     wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
@@ -1137,6 +1167,8 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
     choicesizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 10 );
     mainsizer->Add( choicesizer, 0, wxEXPAND );
 
+#endif
+
     m_choice->Append( firstWildText, (void*) new wxString( firstWild ) );
     while (tokens.HasMoreTokens())
     {
@@ -1371,6 +1403,8 @@ void wxFileDialog::OnHome( wxCommandEvent &WXUNUSED(event) )
     wxString dir;
     m_list->GetDir( dir );
     m_static->SetLabel( dir );
+    
+    m_text->SetFocus();
 }
 
 void wxFileDialog::OnNew( wxCommandEvent &WXUNUSED(event) )