Compilation fix.

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

diff --git a/include/wx/msw/filedlg.h b/include/wx/msw/filedlg.h
index 3013be4204de3befcf742c2809eb7de2eec834ec..482200ad1ab90466d724c60d48d1b58034b0b6b3 100644 (file)
--- a/include/wx/msw/filedlg.h
+++ b/include/wx/msw/filedlg.h
@@ -12,10 +12,6 @@
 #ifndef _WX_FILEDLG_H_
 #define _WX_FILEDLG_H_
 
 #ifndef _WX_FILEDLG_H_
 #define _WX_FILEDLG_H_
 

-#ifdef __GNUG__
-    #pragma interface "filedlg.h"
-#endif
-

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


@@ -28,17 +24,40 @@ public:
                  const wxString& defaultDir = wxEmptyString,
                  const wxString& defaultFile = wxEmptyString,
                  const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
                  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 void SetPath(const wxString& path);
     virtual void GetPaths(wxArrayString& paths) const;
 
     virtual void SetPath(const wxString& path);
     virtual void GetPaths(wxArrayString& paths) const;

+    virtual void GetFilenames(wxArrayString& files) const;

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

+    // wxMSW-specific implementation from now on
+    // -----------------------------------------
+
+    // called from the hook procedure on CDN_INITDONE reception
+    virtual void MSWOnInitDone(WXHWND hDlg);
+
+protected:
+
+#if !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
+    virtual void DoMoveWindow(int x, int y, int width, int height);
+    virtual void DoCentre(int dir);
+    virtual void DoGetSize( int *width, int *height ) const;
+    virtual void DoGetPosition( int *x, int *y ) const;
+#endif // !(__SMARTPHONE__ && __WXWINCE__)
+

 private:
     wxArrayString m_fileNames;
 
 private:
     wxArrayString m_fileNames;
 

+    // remember if our SetPosition() or Centre() (which requires special
+    // treatment) was called
+    bool m_bMovedWindow;
+    int m_centreDir;        // nothing to do if 0
+

     DECLARE_DYNAMIC_CLASS(wxFileDialog)
     DECLARE_NO_COPY_CLASS(wxFileDialog)
 };
     DECLARE_DYNAMIC_CLASS(wxFileDialog)
     DECLARE_NO_COPY_CLASS(wxFileDialog)
 };