attempt to fix first click problem

[wxWidgets.git] / include / wx / motif / filedlg.h

diff --git a/include/wx/motif/filedlg.h b/include/wx/motif/filedlg.h
index 510b4392fa71c5d2c2b07c853f6769efe9eb2810..0ab28518208e6d854429bb716ddb216ae8bb8f98 100644 (file)
--- a/include/wx/motif/filedlg.h
+++ b/include/wx/motif/filedlg.h
@@ -12,22 +12,22 @@
 #ifndef _WX_FILEDLG_H_
 #define _WX_FILEDLG_H_
 
 #ifndef _WX_FILEDLG_H_
 #define _WX_FILEDLG_H_
 

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

 #pragma interface "filedlg.h"
 #endif
 
 #include "wx/dialog.h"
 
 /*
 #pragma interface "filedlg.h"
 #endif
 
 #include "wx/dialog.h"
 
 /*

- * File selector
- */
+* File selector
+*/

 
 WXDLLEXPORT_DATA(extern const char*) wxFileSelectorPromptStr;
 WXDLLEXPORT_DATA(extern const char*) wxFileSelectorDefaultWildcardStr;
 
 class WXDLLEXPORT wxFileDialog: public wxDialog
 {
 
 WXDLLEXPORT_DATA(extern const char*) wxFileSelectorPromptStr;
 WXDLLEXPORT_DATA(extern const char*) wxFileSelectorDefaultWildcardStr;
 
 class WXDLLEXPORT wxFileDialog: public wxDialog
 {

-DECLARE_DYNAMIC_CLASS(wxFileDialog)
+    DECLARE_DYNAMIC_CLASS(wxFileDialog)

 public:
     wxString    m_message;
     long        m_dialogStyle;
 public:
     wxString    m_message;
     long        m_dialogStyle;


@@ -37,17 +37,17 @@ public:
     wxString    m_fileName;
     wxString    m_wildCard;
     int         m_filterIndex;
     wxString    m_fileName;
     wxString    m_wildCard;
     int         m_filterIndex;

-
+    

     // For Motif
     wxPoint     m_pos;
     static wxString m_fileSelectorAnswer;
     static bool m_fileSelectorReturned;
     // For Motif
     wxPoint     m_pos;
     static wxString m_fileSelectorAnswer;
     static bool m_fileSelectorReturned;

-
+    

 public:
     wxFileDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr,
         const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
         long style = 0, const wxPoint& pos = wxDefaultPosition);
 public:
     wxFileDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr,
         const wxString& defaultDir = "", const wxString& defaultFile = "", const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
         long style = 0, const wxPoint& pos = wxDefaultPosition);

-
+    

     inline void SetMessage(const wxString& message) { m_message = message; }
     inline void SetPath(const wxString& path) { m_path = path; }
     inline void SetDirectory(const wxString& dir) { m_dir = dir; }
     inline void SetMessage(const wxString& message) { m_message = message; }
     inline void SetPath(const wxString& path) { m_path = path; }
     inline void SetDirectory(const wxString& dir) { m_dir = dir; }


@@ -55,18 +55,18 @@ public:
     inline void SetWildcard(const wxString& wildCard) { m_wildCard = wildCard; }
     inline void SetStyle(long style) { m_dialogStyle = style; }
     inline void SetFilterIndex(int filterIndex) { m_filterIndex = filterIndex; }
     inline void SetWildcard(const wxString& wildCard) { m_wildCard = wildCard; }
     inline void SetStyle(long style) { m_dialogStyle = style; }
     inline void SetFilterIndex(int filterIndex) { m_filterIndex = filterIndex; }

-
+    

     inline wxString GetMessage() const { return m_message; }
     inline wxString GetPath() const { return m_path; }
     inline void GetPaths(wxArrayString& a) { a.Empty(); a.Add(m_path); }
     inline wxString GetDirectory() const { return m_dir; }
     inline wxString GetFilename() const { return m_fileName; }
     inline void GetFilenames(wxArrayString& a) { a.Empty();
     inline wxString GetMessage() const { return m_message; }
     inline wxString GetPath() const { return m_path; }
     inline void GetPaths(wxArrayString& a) { a.Empty(); a.Add(m_path); }
     inline wxString GetDirectory() const { return m_dir; }
     inline wxString GetFilename() const { return m_fileName; }
     inline void GetFilenames(wxArrayString& a) { a.Empty();

-       a.Add( m_fileName); }
+    a.Add( m_fileName); }

     inline wxString GetWildcard() const { return m_wildCard; }
     inline long GetStyle() const { return m_dialogStyle; }
     inline int GetFilterIndex() const { return m_filterIndex ; }
     inline wxString GetWildcard() const { return m_wildCard; }
     inline long GetStyle() const { return m_dialogStyle; }
     inline int GetFilterIndex() const { return m_filterIndex ; }

-
+    

     int ShowModal();
 };
 
     int ShowModal();
 };
 


@@ -78,15 +78,15 @@ public:
 
 // File selector - backward compatibility
 WXDLLEXPORT wxString wxFileSelector(const char *message = wxFileSelectorPromptStr, const char *default_path = NULL,
 
 // File selector - backward compatibility
 WXDLLEXPORT wxString wxFileSelector(const char *message = wxFileSelectorPromptStr, const char *default_path = NULL,

-                     const char *default_filename = NULL, const char *default_extension = NULL,
-                     const char *wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0,
-                     wxWindow *parent = NULL, int x = -1, int y = -1);
+                                    const char *default_filename = NULL, const char *default_extension = NULL,
+                                    const char *wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0,
+                                    wxWindow *parent = NULL, int x = -1, int y = -1);

 
 // An extended version of wxFileSelector
 WXDLLEXPORT wxString wxFileSelectorEx(const char *message = wxFileSelectorPromptStr, const char *default_path = NULL,
 
 // An extended version of wxFileSelector
 WXDLLEXPORT wxString wxFileSelectorEx(const char *message = wxFileSelectorPromptStr, const char *default_path = NULL,

-                     const char *default_filename = NULL, int *indexDefaultExtension = NULL,
-                     const char *wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0,
-                     wxWindow *parent = NULL, int x = -1, int y = -1);
+                                      const char *default_filename = NULL, int *indexDefaultExtension = NULL,
+                                      const char *wildcard = wxFileSelectorDefaultWildcardStr, int flags = 0,
+                                      wxWindow *parent = NULL, int x = -1, int y = -1);

 
 // Generic file load dialog
 WXDLLEXPORT wxString wxLoadFileSelector(const char *what, const char *extension, const char *default_name = NULL, wxWindow *parent = NULL);
 
 // Generic file load dialog
 WXDLLEXPORT wxString wxLoadFileSelector(const char *what, const char *extension, const char *default_name = NULL, wxWindow *parent = NULL);


@@ -95,4 +95,4 @@ WXDLLEXPORT wxString wxLoadFileSelector(const char *what, const char *extension,
 WXDLLEXPORT wxString wxSaveFileSelector(const char *what, const char *extension, const char *default_name = NULL, wxWindow *parent = NULL);
 
 #endif
 WXDLLEXPORT wxString wxSaveFileSelector(const char *what, const char *extension, const char *default_name = NULL, wxWindow *parent = NULL);
 
 #endif

-    // _WX_FILEDLG_H_
+// _WX_FILEDLG_H_