Robert Lang's patch [ 1583183 ] Fixes printing/print preview inconsistencies

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

diff --git a/include/wx/motif/filedlg.h b/include/wx/motif/filedlg.h
index d799a4c85b42fa2ff67b76f534d66a3daa7d6fe9..3b68253eb72e164087b04fd3867446e00ef9970f 100644 (file)
--- a/include/wx/motif/filedlg.h
+++ b/include/wx/motif/filedlg.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        filedlg.h
+// Name:        wx/motif/filedlg.h

 // Purpose:     wxFileDialog class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxFileDialog class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FILEDLG_H_
 #define _WX_FILEDLG_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FILEDLG_H_
 #define _WX_FILEDLG_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "filedlg.h"
-#endif
-

 //-------------------------------------------------------------------------
 // wxFileDialog
 //-------------------------------------------------------------------------
 //-------------------------------------------------------------------------
 // wxFileDialog
 //-------------------------------------------------------------------------


@@ -24,20 +20,22 @@ class WXDLLEXPORT wxFileDialog: public wxFileDialogBase
 {
     DECLARE_DYNAMIC_CLASS(wxFileDialog)
 public:
 {
     DECLARE_DYNAMIC_CLASS(wxFileDialog)
 public:

-    
+

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

-    
+

 public:
     wxFileDialog(wxWindow *parent,
                  const wxString& message = wxFileSelectorPromptStr,
                  const wxString& defaultDir = wxEmptyString,
                  const wxString& defaultFile = wxEmptyString,
                  const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
 public:
     wxFileDialog(wxWindow *parent,
                  const wxString& message = wxFileSelectorPromptStr,
                  const wxString& defaultDir = wxEmptyString,
                  const wxString& defaultFile = wxEmptyString,
                  const wxString& wildCard = wxFileSelectorDefaultWildcardStr,

-                 long style = 0,
-                 const wxPoint& pos = wxDefaultPosition);
-    
+                 long style = wxFD_DEFAULT_STYLE,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& sz = wxDefaultSize,
+                 const wxString& name = wxFileDialogNameStr);
+

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