reverting part of Kevin O's patch, due to incompatibility problems

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

diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp
index ed2ca5e9c49a4018232b8f7e41b41231847aaf29..bcf6784fcad944b2848be76c7492784cdba4ff4e 100644 (file)
--- a/src/motif/filedlg.cpp
+++ b/src/motif/filedlg.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "filedlg.h"
 #endif
 
 #pragma implementation "filedlg.h"
 #endif
 


@@ -21,7 +21,6 @@
 
 #include "wx/defs.h"
 #include "wx/utils.h"
 
 #include "wx/defs.h"
 #include "wx/utils.h"

-#include "wx/dialog.h"

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


@@ -47,7 +46,7 @@
 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 

-IMPLEMENT_CLASS(wxFileDialog, wxDialog)
+IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)

 
 #define DEFAULT_FILE_SELECTOR_SIZE 0
 // Let Motif defines the size of File
 
 #define DEFAULT_FILE_SELECTOR_SIZE 0
 // Let Motif defines the size of File


@@ -57,65 +56,6 @@ IMPLEMENT_CLASS(wxFileDialog, wxDialog)
 #define wxFSB_HEIGHT               500
 
 
 #define wxFSB_HEIGHT               500
 
 

-wxString wxFileSelector(const char *title,
-                     const char *defaultDir, const char *defaultFileName,
-                     const char *defaultExtension, const char *filter, int flags,
-                     wxWindow *parent, int x, int y)
-{
-    // If there's a default extension specified but no filter, we create a suitable
-    // filter.
-
-    wxString filter2("");
-    if ( defaultExtension && !filter )
-        filter2 = wxString("*.") + wxString(defaultExtension) ;
-    else if ( filter )
-        filter2 = filter;
-
-    wxString defaultDirString;
-    if (defaultDir)
-        defaultDirString = defaultDir;
-    else
-        defaultDirString = "";
-
-    wxString defaultFilenameString;
-    if (defaultFileName)
-        defaultFilenameString = defaultFileName;
-    else
-        defaultFilenameString = "";
-
-    wxFileDialog fileDialog(parent, title, defaultDirString, defaultFilenameString, filter2, flags, wxPoint(x, y));
-
-    if ( fileDialog.ShowModal() == wxID_OK )
-    {
-        return fileDialog.GetPath();
-    }
-    else
-        return wxEmptyString;
-}
-
-wxString wxFileSelectorEx(const char *title,
-                       const char *defaultDir,
-                       const char *defaultFileName,
-                       int* defaultFilterIndex,
-                       const char *filter,
-                       int       flags,
-                       wxWindow* parent,
-                       int       x,
-                       int       y)
-
-{
-    wxFileDialog fileDialog(parent, title ? title : "", defaultDir ? defaultDir : "",
-        defaultFileName ? defaultFileName : "", filter ? filter : "", flags, wxPoint(x, y));
-
-    if ( fileDialog.ShowModal() == wxID_OK )
-    {
-        *defaultFilterIndex = fileDialog.GetFilterIndex();
-        return fileDialog.GetPath();
-    }
-    else
-        return wxEmptyString;
-}
-

 wxString wxFileDialog::m_fileSelectorAnswer = "";
 bool wxFileDialog::m_fileSelectorReturned = FALSE;
 
 wxString wxFileDialog::m_fileSelectorAnswer = "";
 bool wxFileDialog::m_fileSelectorReturned = FALSE;
 


@@ -174,16 +114,9 @@ static wxString ParseWildCard( const wxString& wild )
 wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                            const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard,
                            long style, const wxPoint& pos)
 wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                            const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard,
                            long style, const wxPoint& pos)

+             :wxFileDialogBase(parent, message, defaultDir, defaultFileName, wildCard, style, pos)

 {
 {

-    m_message = message;
-    m_dialogStyle = style;
-    m_parent = parent;
-    m_path = "";
-    m_fileName = defaultFileName;
-    m_dir = defaultDir;
-    m_wildCard = wildCard;

     m_filterIndex = 1;
     m_filterIndex = 1;

-    m_pos = pos;

 }
 
 static void wxChangeListBoxColours(wxWindow* WXUNUSED(win), Widget widget)
 }
 
 static void wxChangeListBoxColours(wxWindow* WXUNUSED(win), Widget widget)


@@ -377,39 +310,3 @@ int wxFileDialog::ShowModal()
         return wxID_OK;
 }
 
         return wxID_OK;
 }
 

-// Generic file load/save dialog
-static wxString
-wxDefaultFileSelector(bool load, const char *what, const char *extension, const char *default_name, wxWindow *parent)
-{
-    char *ext = wxConstCast(extension, char);
-
-    wxString prompt;
-    wxString str;
-    if (load)
-        str = _("Load %s file");
-    else
-        str = _("Save %s file");
-    prompt.Printf(str, what);
-
-    if (*ext == '.')
-        ext++;
-    wxString wild;
-    wild.Printf("*.%s", ext);
-
-    return wxFileSelector (prompt, NULL, default_name, ext, wild, 0, parent);
-}
-
-// Generic file load dialog
-wxString wxLoadFileSelector(const char *what, const char *extension, const char *default_name, wxWindow *parent)
-{
-    return wxDefaultFileSelector(TRUE, what, extension, default_name, parent);
-}
-
-
-// Generic file save dialog
-wxString wxSaveFileSelector(const char *what, const char *extension, const char *default_name, wxWindow *parent)
-{
-    return wxDefaultFileSelector(FALSE, what, extension, default_name, parent);
-}
-
-