Changes for 16-bit BC++ (not there yet), GnuWin32; typetest sample
fixed; some documentation fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -82,7 +82,7 @@ class WXDLLEXPORT wxDirDialog: public wxDialog
|
||||
public:
|
||||
wxDirDialog(wxWindow *parent,
|
||||
const wxString& message = wxFileSelectorPromptStr,
|
||||
const wxString& defaultPath = "",
|
||||
const wxString& defaultPath = wxEmptyString,
|
||||
long style = 0, const wxPoint& pos = wxDefaultPosition);
|
||||
inline void SetMessage(const wxString& message) { m_message = message; }
|
||||
inline void SetPath(const wxString& path) { m_path = path; }
|
||||
|
@@ -226,6 +226,29 @@ protected:
|
||||
// ----------------------------------------------------------------------------
|
||||
typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
|
||||
|
||||
// Because of name truncation!
|
||||
#if defined(__BORLANDC__) && defined(__WIN16__)
|
||||
|
||||
#define EVT_NOTEBOOK_PAGE_CHANGED(id, fn) \
|
||||
{ \
|
||||
wxEVT_COMMAND_NB_PAGE_CHANGED, \
|
||||
id, \
|
||||
-1, \
|
||||
(wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \
|
||||
NULL \
|
||||
},
|
||||
|
||||
#define EVT_NOTEBOOK_PAGE_CHANGING(id, fn) \
|
||||
{ \
|
||||
wxEVT_COMMAND_NB_PAGE_CHANGING, \ \
|
||||
id, \
|
||||
-1, \
|
||||
(wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \
|
||||
NULL \
|
||||
},
|
||||
|
||||
#else
|
||||
|
||||
#define EVT_NOTEBOOK_PAGE_CHANGED(id, fn) \
|
||||
{ \
|
||||
wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, \
|
||||
@@ -244,4 +267,6 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
|
||||
NULL \
|
||||
},
|
||||
|
||||
#endif
|
||||
|
||||
#endif // _WX_NOTEBOOK_H_
|
||||
|
@@ -16,6 +16,12 @@
|
||||
#pragma interface "treectrl.h"
|
||||
#endif
|
||||
|
||||
#ifdef __WXMSW__
|
||||
WXDLLEXPORT_DATA(extern const char*) wxTreeCtrlNameStr;
|
||||
#else
|
||||
#define wxTreeCtrlNameStr "wxTreeCtrl"
|
||||
#endif
|
||||
|
||||
#include "wx/defs.h"
|
||||
#include "wx/string.h"
|
||||
#include "wx/object.h"
|
||||
@@ -201,7 +207,7 @@ public:
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
|
||||
const wxValidator &validator = wxDefaultValidator,
|
||||
const wxString& name = "wxTreeCtrl")
|
||||
const wxString& name = wxTreeCtrlNameStr)
|
||||
{
|
||||
Create(parent, id, pos, size, style, validator, name);
|
||||
}
|
||||
@@ -213,7 +219,7 @@ public:
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
|
||||
const wxValidator &validator = wxDefaultValidator,
|
||||
const wxString& name = "wxTreeCtrl");
|
||||
const wxString& name = wxTreeCtrlNameStr);
|
||||
|
||||
// accessors
|
||||
// ---------
|
||||
|
Reference in New Issue
Block a user