Fixed various NULL reference issues. Also cleaned up wxPGComboBox code overall a...

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

diff --git a/include/wx/generic/filepickerg.h b/include/wx/generic/filepickerg.h
index ec23c505bdce0002e2ebe994f250cfd2f7591e93..6206ba0ebb53cc4b185b2550bbbc640b2015058c 100644 (file)
--- a/include/wx/generic/filepickerg.h
+++ b/include/wx/generic/filepickerg.h
@@ -17,8 +17,8 @@
 #include "wx/dirdlg.h"
 
 
-extern WXDLLEXPORT_DATA(const wxEventType) wxEVT_COMMAND_DIRPICKER_CHANGED;
-extern WXDLLEXPORT_DATA(const wxEventType) wxEVT_COMMAND_FILEPICKER_CHANGED;
+extern WXDLLIMPEXP_DATA_CORE(const wxEventType) wxEVT_COMMAND_DIRPICKER_CHANGED;
+extern WXDLLIMPEXP_DATA_CORE(const wxEventType) wxEVT_COMMAND_FILEPICKER_CHANGED;
 
 
 //-----------------------------------------------------------------------------
@@ -48,6 +48,8 @@ public:
 
     virtual ~wxGenericFileDirButton() {}
 
+    virtual wxControl *AsControl() { return this; }
+
 public:     // overrideable
 
     virtual wxDialog *CreateDialog() = 0;
@@ -178,7 +180,7 @@ public:     // overrideable
 
     virtual long GetDialogStyle() const
     {
-        long dirdlgstyle = 0;
+        long dirdlgstyle = wxDD_DEFAULT_STYLE;
 
         if (this->HasFlag(wxDIRP_DIR_MUST_EXIST))
             dirdlgstyle |= wxDD_DIR_MUST_EXIST;