Corrected/added support for column headers with icon and text

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

diff --git a/include/wx/msw/filedlg.h b/include/wx/msw/filedlg.h
index c84b139b960796e08f627b64bc60b354f52b8cb4..3cc4a52d55266a356be356ed8a774ec550b051a5 100644 (file)
--- a/include/wx/msw/filedlg.h
+++ b/include/wx/msw/filedlg.h
@@ -12,15 +12,11 @@
 #ifndef _WX_FILEDLG_H_
 #define _WX_FILEDLG_H_
 
 #ifndef _WX_FILEDLG_H_
 #define _WX_FILEDLG_H_
 

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

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

-class WXDLLEXPORT wxFileDialog: public wxFileDialogBase
+class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase

 {
 public:
     wxFileDialog(wxWindow *parent,
 {
 public:
     wxFileDialog(wxWindow *parent,


@@ -28,8 +24,10 @@ 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;


@@ -37,14 +35,28 @@ public:
 
     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:
 protected:

+
+#if !(defined(__SMARTPHONE__) && defined(__WXWINCE__))

     virtual void DoMoveWindow(int x, int y, int width, int height);
     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;
     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;
     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)