replace use of 'long/int bitmapType' with 'wxBitmapType bitmapType' in richtext and...

[wxWidgets.git] / include / wx / filectrl.h

diff --git a/include/wx/filectrl.h b/include/wx/filectrl.h
index 8e9f6f49a5c8a6a143ddfbc33e06f8edc16a8348..b3756ef62c38b9d0c661d756dd466cf3c52e87c0 100644 (file)
--- a/include/wx/filectrl.h
+++ b/include/wx/filectrl.h
@@ -29,13 +29,11 @@ enum
 };
 
 #define wxFC_DEFAULT_STYLE wxFC_OPEN
 };
 
 #define wxFC_DEFAULT_STYLE wxFC_OPEN

-extern WXDLLEXPORT_DATA( const wxChar ) wxFileCtrlNameStr[];
+extern WXDLLIMPEXP_DATA_CORE( const wxChar ) wxFileCtrlNameStr[]; // in filectrlcmn.cpp

 
 

-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EXPORTED_EVENT_TYPE( WXDLLIMPEXP_CORE, wxEVT_FILECTRL_SELECTIONCHANGED, 1150 )
-    DECLARE_EXPORTED_EVENT_TYPE( WXDLLIMPEXP_CORE, wxEVT_FILECTRL_FILEACTIVATED, 1151 )
-    DECLARE_EXPORTED_EVENT_TYPE( WXDLLIMPEXP_CORE, wxEVT_FILECTRL_FOLDERCHANGED, 1152 )
-END_DECLARE_EVENT_TYPES()
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_FILECTRL_SELECTIONCHANGED;
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_FILECTRL_FILEACTIVATED;
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_FILECTRL_FOLDERCHANGED;

 
 class WXDLLIMPEXP_CORE wxFileCtrlBase
 {
 
 class WXDLLIMPEXP_CORE wxFileCtrlBase
 {


@@ -73,7 +71,7 @@ void GenerateFolderChangedEvent( wxFileCtrlBase *fileCtrl, wxWindow *wnd );
 void GenerateSelectionChangedEvent( wxFileCtrlBase *fileCtrl, wxWindow *wnd );
 void GenerateFileActivatedEvent( wxFileCtrlBase *fileCtrl, wxWindow *wnd, const wxString filename = wxEmptyString );
 
 void GenerateSelectionChangedEvent( wxFileCtrlBase *fileCtrl, wxWindow *wnd );
 void GenerateFileActivatedEvent( wxFileCtrlBase *fileCtrl, wxWindow *wnd, const wxString filename = wxEmptyString );
 

-#if defined(__WXGTK24__) && !defined(__WXUNIVERSAL__)
+#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)

     #define wxFileCtrl wxGtkFileCtrl
     #include "wx/gtk/filectrl.h"
 #else
     #define wxFileCtrl wxGtkFileCtrl
     #include "wx/gtk/filectrl.h"
 #else