Only return -1,0,1 from wxXmlResource::CompareVersion().

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

diff --git a/include/wx/generic/filectrlg.h b/include/wx/generic/filectrlg.h
index 3bf08570bab1f7f3b2bae0f82f6b3cddf181d17f..9bcc5d08d6df356bf417f3219f4a8299b9198285 100644 (file)
--- a/include/wx/generic/filectrlg.h
+++ b/include/wx/generic/filectrlg.h
@@ -14,7 +14,7 @@
 
 #if wxUSE_FILECTRL
 
 
 #if wxUSE_FILECTRL
 

-#include "wx/panel.h"
+#include "wx/containr.h"

 #include "wx/listctrl.h"
 #include "wx/filectrl.h"
 #include "wx/filename.h"
 #include "wx/listctrl.h"
 #include "wx/filectrl.h"
 #include "wx/filename.h"


@@ -24,13 +24,13 @@ class WXDLLIMPEXP_FWD_CORE wxChoice;
 class WXDLLIMPEXP_FWD_CORE wxStaticText;
 class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 
 class WXDLLIMPEXP_FWD_CORE wxStaticText;
 class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 

-extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorDefaultWildcardStr[];

 
 //-----------------------------------------------------------------------------
 //  wxFileData - a class to hold the file info for the wxFileListCtrl
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 //  wxFileData - a class to hold the file info for the wxFileListCtrl
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFileData
+class WXDLLIMPEXP_CORE wxFileData

 {
 public:
     enum fileType
 {
 public:
     enum fileType


@@ -125,7 +125,7 @@ private:
 //  wxFileListCtrl
 //-----------------------------------------------------------------------------
 
 //  wxFileListCtrl
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFileListCtrl : public wxListCtrl
+class WXDLLIMPEXP_CORE wxFileListCtrl : public wxListCtrl

 {
 public:
     wxFileListCtrl();
 {
 public:
     wxFileListCtrl();


@@ -182,7 +182,7 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-class WXDLLIMPEXP_CORE wxGenericFileCtrl : public wxPanel,
+class WXDLLIMPEXP_CORE wxGenericFileCtrl : public wxNavigationEnabled<wxControl>,

                                            public wxFileCtrlBase
 {
 public:
                                            public wxFileCtrlBase
 {
 public: