Compilation fixes for old SDKs (VC6) after recent commit.

[wxWidgets.git] / include / wx / generic / dirdlgg.h

diff --git a/include/wx/generic/dirdlgg.h b/include/wx/generic/dirdlgg.h
index 93dcac9bec3548ed486fe0d61e400e773b4f3ffd..79c15b278dde407fc01597c013c4190ad016ec80 100644 (file)
--- a/include/wx/generic/dirdlgg.h
+++ b/include/wx/generic/dirdlgg.h
@@ -15,21 +15,19 @@
 #ifndef _WX_DIRDLGG_H_
 #define _WX_DIRDLGG_H_
 
 #ifndef _WX_DIRDLGG_H_
 #define _WX_DIRDLGG_H_
 

-class WXDLLEXPORT wxGenericDirCtrl;
-class WXDLLEXPORT wxTextCtrl;
-class WXDLLEXPORT wxTreeEvent;
+class WXDLLIMPEXP_FWD_CORE wxGenericDirCtrl;
+class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
+class WXDLLIMPEXP_FWD_CORE wxTreeEvent;

 
 // we may be included directly as well as from wx/dirdlg.h (FIXME)
 
 // we may be included directly as well as from wx/dirdlg.h (FIXME)

-extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[];
-extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[];
-#ifndef wxDD_DEFAULT_STYLE
+extern WXDLLIMPEXP_DATA_CORE(const char) wxDirDialogNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxDirSelectorPromptStr[];

 
 

+#ifndef wxDD_DEFAULT_STYLE

 #ifdef __WXWINCE__
 #ifdef __WXWINCE__

-    #define wxDD_DEFAULT_STYLE \
-        (wxDEFAULT_DIALOG_STYLE | wxDD_NEW_DIR_BUTTON)
+    #define wxDD_DEFAULT_STYLE      wxDEFAULT_DIALOG_STYLE

 #else
 #else

-    #define wxDD_DEFAULT_STYLE \
-        (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON)
+    #define wxDD_DEFAULT_STYLE      (wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)

 #endif
 #endif
 
 #endif
 #endif
 


@@ -39,7 +37,7 @@ extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[];
 // wxGenericDirDialog
 //-----------------------------------------------------------------------------
 
 // wxGenericDirDialog
 //-----------------------------------------------------------------------------
 

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

 {
 public:
     wxGenericDirDialog() : wxDirDialogBase() { }
 {
 public:
     wxGenericDirDialog() : wxDirDialogBase() { }


@@ -62,13 +60,11 @@ public:
 
     //// Accessors
     void SetPath(const wxString& path);
 
     //// Accessors
     void SetPath(const wxString& path);

-    void SetStyle(long style) { m_dialogStyle = style; }
-

     wxString GetPath() const;
     wxString GetPath() const;

-    long GetStyle() const { return m_dialogStyle; }

 
     //// Overrides
     virtual int ShowModal();
 
     //// Overrides
     virtual int ShowModal();

+    virtual void EndModal(int retCode);

 
     // this one is specific to wxGenericDirDialog
     wxTextCtrl* GetInputCtrl() const { return m_input; }
 
     // this one is specific to wxGenericDirDialog
     wxTextCtrl* GetInputCtrl() const { return m_input; }


@@ -83,7 +79,6 @@ protected:
     void OnGoHome(wxCommandEvent& event);
     void OnShowHidden(wxCommandEvent& event);
 
     void OnGoHome(wxCommandEvent& event);
     void OnShowHidden(wxCommandEvent& event);
 

-    long              m_dialogStyle;

     wxGenericDirCtrl* m_dirCtrl;
     wxTextCtrl*       m_input;
 
     wxGenericDirCtrl* m_dirCtrl;
     wxTextCtrl*       m_input;