Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed compilation when included directly and not via wx/dirdlg.h

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-05-04 12:45:14 +00:00
parent a079e64502
commit 74d8ead3f2
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
include/wx/generic/dirdlgg.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: dirdlgg.h // Name: wx/generic/dirdlgg.h
// Purpose: wxGenericDirCtrl class // Purpose: wxGenericDirCtrl class
// Builds on wxDirCtrl class written by Robert Roebling for the // Builds on wxDirCtrl class written by Robert Roebling for the
// wxFile application, modified by Harm van der Heijden. // wxFile application, modified by Harm van der Heijden.
@@ -23,11 +23,21 @@ class WXDLLEXPORT wxGenericDirCtrl;
class WXDLLEXPORT wxTextCtrl; class WXDLLEXPORT wxTextCtrl;
class WXDLLEXPORT wxTreeEvent; class WXDLLEXPORT wxTreeEvent;
// we may be included directly as well as from wx/dirdlg.h (FIXME)
WXDLLEXPORT_DATA(extern const wxChar*) wxDirDialogNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxDirSelectorPromptStr;
#ifndef wxDD_DEFAULT_STYLE
#define wxDD_DEFAULT_STYLE \
(wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON)
#endif
#include "wx/dialog.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxGenericDirDialog // wxGenericDirDialog
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class WXDLLEXPORT wxGenericDirDialog: public wxDialog class WXDLLEXPORT wxGenericDirDialog : public wxDialog
{ {
public: public:
wxGenericDirDialog() : wxDialog() { } wxGenericDirDialog() : wxDialog() { }
@@ -41,18 +51,19 @@ public:
const wxString& name = wxDirDialogNameStr); const wxString& name = wxDirDialogNameStr);
//// Accessors //// Accessors
inline void SetMessage(const wxString& message) { m_message = message; } void SetMessage(const wxString& message) { m_message = message; }
void SetPath(const wxString& path); void SetPath(const wxString& path);
inline void SetStyle(long style) { m_dialogStyle = style; } void SetStyle(long style) { m_dialogStyle = style; }
inline wxString GetMessage(void) const { return m_message; } wxString GetMessage() const { return m_message; }
wxString GetPath(void) const; wxString GetPath() const;
inline long GetStyle(void) const { return m_dialogStyle; } long GetStyle() const { return m_dialogStyle; }
wxTextCtrl* GetInputCtrl() const { return m_input; }
//// Overrides //// Overrides
int ShowModal(); virtual int ShowModal();
// this one is specific to wxGenericDirDialog
wxTextCtrl* GetInputCtrl() const { return m_input; }
protected: protected:
//// Event handlers //// Event handlers