projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add wxLoadUserResource() overload not copying the resource data.
[wxWidgets.git]
/
include
/
wx
/
fontpicker.h
diff --git
a/include/wx/fontpicker.h
b/include/wx/fontpicker.h
index 14da2fffc29f1321ea49655b0fdd2a04760d8eeb..243e613871da68409cc6935a663900fc30fd0073 100644
(file)
--- a/
include/wx/fontpicker.h
+++ b/
include/wx/fontpicker.h
@@
-22,8
+22,8
@@
class WXDLLIMPEXP_FWD_CORE wxFontPickerEvent;
class WXDLLIMPEXP_FWD_CORE wxFontPickerEvent;
-extern WXDLL
EXPORT_DATA(const wxC
har) wxFontPickerWidgetNameStr[];
-extern WXDLL
EXPORT_DATA(const wxC
har) wxFontPickerCtrlNameStr[];
+extern WXDLL
IMPEXP_DATA_CORE(const c
har) wxFontPickerWidgetNameStr[];
+extern WXDLL
IMPEXP_DATA_CORE(const c
har) wxFontPickerCtrlNameStr[];
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
@@
-180,9
+180,7
@@
private:
// wxFontPickerEvent: used by wxFontPickerCtrl only
// ----------------------------------------------------------------------------
// wxFontPickerEvent: used by wxFontPickerCtrl only
// ----------------------------------------------------------------------------
-BEGIN_DECLARE_EVENT_TYPES()
- DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_CORE, wxEVT_COMMAND_FONTPICKER_CHANGED, 1102)
-END_DECLARE_EVENT_TYPES()
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_FONTPICKER_CHANGED, wxFontPickerEvent );
class WXDLLIMPEXP_CORE wxFontPickerEvent : public wxCommandEvent
{
class WXDLLIMPEXP_CORE wxFontPickerEvent : public wxCommandEvent
{
@@
-214,7
+212,7
@@
private:
typedef void (wxEvtHandler::*wxFontPickerEventFunction)(wxFontPickerEvent&);
#define wxFontPickerEventHandler(func) \
typedef void (wxEvtHandler::*wxFontPickerEventFunction)(wxFontPickerEvent&);
#define wxFontPickerEventHandler(func) \
-
(wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxFontPickerEventFunction, &
func)
+
wxEVENT_HANDLER_CAST(wxFontPickerEventFunction,
func)
#define EVT_FONTPICKER_CHANGED(id, fn) \
wx__DECLARE_EVT1(wxEVT_COMMAND_FONTPICKER_CHANGED, id, wxFontPickerEventHandler(fn))
#define EVT_FONTPICKER_CHANGED(id, fn) \
wx__DECLARE_EVT1(wxEVT_COMMAND_FONTPICKER_CHANGED, id, wxFontPickerEventHandler(fn))