Fixed player dialog listbox size and app icon on wxGTK

[wxWidgets.git] / src / os2 / filedlg.cpp

diff --git a/src/os2/filedlg.cpp b/src/os2/filedlg.cpp
index eb13f404432128d20e103ad46d85a2d2e7ab516a..77dcc5c30db45f9ab1a2b0e76ed14ee6f7629272 100644 (file)
--- a/src/os2/filedlg.cpp
+++ b/src/os2/filedlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        filedlg.cpp
+// Name:        src/os2/filedlg.cpp

 // Purpose:     wxFileDialog
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxFileDialog
 // Author:      David Webster
 // Modified by:


@@ -18,10 +18,11 @@
 
 #if wxUSE_FILEDLG
 
 
 #if wxUSE_FILEDLG
 

+#include "wx/filedlg.h"
+

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/msgdlg.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/msgdlg.h"

-    #include "wx/filedlg.h"

     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"


@@ -71,13 +72,14 @@ wxFileDialog::wxFileDialog (
 , const wxString&                   rsDefaultFileName
 , const wxString&                   rsWildCard
 , long                              lStyle
 , const wxString&                   rsDefaultFileName
 , const wxString&                   rsWildCard
 , long                              lStyle

-, const wxPoint&                    rPos
+, const wxPoint&                    rPos,
+  const wxSize& sz,
+  const wxString& name

 )
 )

-    :wxFileDialogBase(pParent, rsMessage, rsDefaultDir, rsDefaultFileName, rsWildCard, lStyle, rPos)
+    :wxFileDialogBase(pParent, rsMessage, rsDefaultDir, rsDefaultFileName, rsWildCard, lStyle, rPos, sz, name)

 
 {
 
 {

-    if ((m_dialogStyle & wxMULTIPLE) && (m_dialogStyle & wxSAVE))
-        m_dialogStyle &= ~wxMULTIPLE;
+    // NB: all style checks are done by wxFileDialogBase::Create

 
     m_filterIndex = 1;
 } // end of wxFileDialog::wxFileDialog
 
     m_filterIndex = 1;
 } // end of wxFileDialog::wxFileDialog


@@ -124,19 +126,14 @@ int wxFileDialog::ShowModal()
     *zFileNameBuffer = wxT('\0');
     *zTitleBuffer    = wxT('\0');
 
     *zFileNameBuffer = wxT('\0');
     *zTitleBuffer    = wxT('\0');
 

-    if (m_dialogStyle & wxSAVE)
+    if (m_windowStyle & wxFD_SAVE)

         lFlags = FDS_SAVEAS_DIALOG;
     else
         lFlags = FDS_OPEN_DIALOG;
 
         lFlags = FDS_SAVEAS_DIALOG;
     else
         lFlags = FDS_OPEN_DIALOG;
 

-#if WXWIN_COMPATIBILITY_2_4
-    if (m_dialogStyle & wxHIDE_READONLY)
-        lFlags |= FDS_SAVEAS_DIALOG;
-#endif
-
-    if (m_dialogStyle & wxSAVE)
+    if (m_windowStyle & wxFD_SAVE)

         lFlags |= FDS_SAVEAS_DIALOG;
         lFlags |= FDS_SAVEAS_DIALOG;

-    if (m_dialogStyle & wxMULTIPLE )
+    if (m_windowStyle & wxFD_MULTIPLE)

         lFlags |= FDS_OPEN_DIALOG | FDS_MULTIPLESEL;
 
     vFileDlg.cbSize = sizeof(FILEDLG);
         lFlags |= FDS_OPEN_DIALOG | FDS_MULTIPLESEL;
 
     vFileDlg.cbSize = sizeof(FILEDLG);


@@ -196,7 +193,7 @@ int wxFileDialog::ShowModal()
     else
         sTheFilter = m_wildCard;
 
     else
         sTheFilter = m_wildCard;
 

-    wxStrtok((wxChar*)sTheFilter.c_str(), wxT("|"), &pzFilterBuffer);
+    wxStrtok(sTheFilter.wchar_str(), wxT("|"), &pzFilterBuffer);

     while(pzFilterBuffer != NULL)
     {
         if (nCount > 0 && !(nCount % 2))
     while(pzFilterBuffer != NULL)
     {
         if (nCount > 0 && !(nCount % 2))


@@ -222,7 +219,7 @@ int wxFileDialog::ShowModal()
     if (hWnd && vFileDlg.lReturn == DID_OK)
     {
         m_fileNames.Empty();
     if (hWnd && vFileDlg.lReturn == DID_OK)
     {
         m_fileNames.Empty();

-        if ((m_dialogStyle & wxMULTIPLE ) && vFileDlg.ulFQFCount > 1)
+        if ((m_windowStyle & wxFD_MULTIPLE ) && vFileDlg.ulFQFCount > 1)

         {
             for (int i = 0; i < (int)vFileDlg.ulFQFCount; i++)
             {
         {
             for (int i = 0; i < (int)vFileDlg.ulFQFCount; i++)
             {


@@ -236,7 +233,7 @@ int wxFileDialog::ShowModal()
             }
             ::WinFreeFileDlgList(vFileDlg.papszFQFilename);
         }
             }
             ::WinFreeFileDlgList(vFileDlg.papszFQFilename);
         }

-        else if (!(m_dialogStyle & wxSAVE))
+        else if (!(m_windowStyle & wxFD_SAVE))

         {
             m_path = (wxChar*)vFileDlg.szFullFile;
             m_fileName = wxFileNameFromPath(wxString((const wxChar*)vFileDlg.szFullFile));
         {
             m_path = (wxChar*)vFileDlg.szFullFile;
             m_fileName = wxFileNameFromPath(wxString((const wxChar*)vFileDlg.szFullFile));


@@ -299,10 +296,10 @@ int wxFileDialog::ShowModal()
             m_dir = wxPathOnly((const wxChar*)vFileDlg.szFullFile);
 
             //
             m_dir = wxPathOnly((const wxChar*)vFileDlg.szFullFile);
 
             //

-            // === Simulating the wxOVERWRITE_PROMPT >>============================
+            // === Simulating the wxFD_OVERWRITE_PROMPT >>============================

             //
             //

-            if ((m_dialogStyle & wxOVERWRITE_PROMPT) &&
-                (m_dialogStyle & wxSAVE) &&
+            if ((m_windowStyle & wxFD_OVERWRITE_PROMPT) &&
+                (m_windowStyle & wxFD_SAVE) &&

                 (wxFileExists(m_path.c_str())))
             {
                 wxString            sMessageText;
                 (wxFileExists(m_path.c_str())))
             {
                 wxString            sMessageText;