Disable double-to-float conversion tests in wxAny code.

[wxWidgets.git] / include / wx / cocoa / dirdlg.h

diff --git a/include/wx/cocoa/dirdlg.h b/include/wx/cocoa/dirdlg.h
index 6b74ed026f24c9433d2e95774677988991c34b5f..9412469bf617505cb77c61b833286895203cffc7 100644 (file)
--- a/include/wx/cocoa/dirdlg.h
+++ b/include/wx/cocoa/dirdlg.h
@@ -19,29 +19,26 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSSavePanel);
 // wxDirDialog
 //-------------------------------------------------------------------------
 
 // wxDirDialog
 //-------------------------------------------------------------------------
 

-class WXDLLEXPORT wxDirDialog: public wxDirDialogBase
+class WXDLLIMPEXP_CORE wxDirDialog: public wxDirDialogBase

 {
     DECLARE_DYNAMIC_CLASS(wxDirDialog)
 {
     DECLARE_DYNAMIC_CLASS(wxDirDialog)

-    DECLARE_NO_COPY_CLASS(wxDirDialog)
+    wxDECLARE_NO_COPY_CLASS(wxDirDialog);

 public:
     wxDirDialog(wxWindow *parent,
                 const wxString& message = wxDirSelectorPromptStr,
 public:
     wxDirDialog(wxWindow *parent,
                 const wxString& message = wxDirSelectorPromptStr,

-                const wxString& defaultPath = _T(""),
+                const wxString& defaultPath = wxT(""),

                 long style = wxDD_DEFAULT_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxString& name = wxDirDialogNameStr);
                 long style = wxDD_DEFAULT_STYLE,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxString& name = wxDirDialogNameStr);

-    ~wxDirDialog();
-
-    long GetStyle() const { return m_dialogStyle; }
+    virtual ~wxDirDialog();

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

-    
+

     inline WX_NSSavePanel GetNSSavePanel()
     {   return (WX_NSSavePanel)m_cocoaNSWindow; }
 
 protected:
     inline WX_NSSavePanel GetNSSavePanel()
     {   return (WX_NSSavePanel)m_cocoaNSWindow; }
 
 protected:

-    long        m_dialogStyle;

     wxString    m_dir;
     wxWindow *  m_parent;
     wxString    m_fileName;
     wxString    m_dir;
     wxWindow *  m_parent;
     wxString    m_fileName;