projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added wxDateTime::SetFrom/GetAsMSWSysTime() (#9161)
[wxWidgets.git]
/
include
/
wx
/
choicebk.h
diff --git
a/include/wx/choicebk.h
b/include/wx/choicebk.h
index 04539083363bad41fda2835423198d963a14f48b..fc6490cf8add225abeda0e16a9dcca3107335f12 100644
(file)
--- a/
include/wx/choicebk.h
+++ b/
include/wx/choicebk.h
@@
-12,23
+12,31
@@
#ifndef _WX_CHOICEBOOK_H_
#define _WX_CHOICEBOOK_H_
#ifndef _WX_CHOICEBOOK_H_
#define _WX_CHOICEBOOK_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "choicebook.h"
-#endif
-
#include "wx/defs.h"
#if wxUSE_CHOICEBOOK
#include "wx/bookctrl.h"
#include "wx/defs.h"
#if wxUSE_CHOICEBOOK
#include "wx/bookctrl.h"
+#include "wx/choice.h"
+
+class WXDLLIMPEXP_FWD_CORE wxChoice;
+
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED;
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING;
-class WXDLLEXPORT wxChoice;
+// wxChoicebook flags
+#define wxCHB_DEFAULT wxBK_DEFAULT
+#define wxCHB_TOP wxBK_TOP
+#define wxCHB_BOTTOM wxBK_BOTTOM
+#define wxCHB_LEFT wxBK_LEFT
+#define wxCHB_RIGHT wxBK_RIGHT
+#define wxCHB_ALIGN_MASK wxBK_ALIGN_MASK
// ----------------------------------------------------------------------------
// wxChoicebook
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// wxChoicebook
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxChoicebook : public wxBookCtrlBase
+class WXDLL
IMPEXP_CORE
wxChoicebook : public wxBookCtrlBase
{
public:
wxChoicebook()
{
public:
wxChoicebook()
@@
-68,30
+76,33
@@
public:
const wxString& text,
bool bSelect = false,
int imageId = -1);
const wxString& text,
bool bSelect = false,
int imageId = -1);
- virtual int SetSelection(size_t n);
+ virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); }
+ virtual int ChangeSelection(size_t n) { return DoSetSelection(n); }
virtual void SetImageList(wxImageList *imageList);
virtual void SetImageList(wxImageList *imageList);
- // returns true if we have wxCHB_TOP or wxCHB_BOTTOM style
- bool IsVertical() const { return HasFlag(wxCHB_BOTTOM | wxCHB_TOP); }
-
virtual bool DeleteAllPages();
virtual bool DeleteAllPages();
+ // returns the choice control
+ wxChoice* GetChoiceCtrl() const { return (wxChoice*)m_bookctrl; }
+
protected:
virtual wxWindow *DoRemovePage(size_t page);
// get the size which the choice control should have
protected:
virtual wxWindow *DoRemovePage(size_t page);
// get the size which the choice control should have
- wxSize GetChoiceSize() const;
+ virtual wxSize GetControllerSize() const;
+
+ void UpdateSelectedPage(size_t newsel)
+ {
+ m_selection = newsel;
+ GetChoiceCtrl()->Select(newsel);
+ }
- // get the page area
-
wxRect GetPageRect() const
;
+ wxBookCtrlBaseEvent* CreatePageChangingEvent() const;
+
void MakeChangedEvent(wxBookCtrlBaseEvent &event)
;
// event handlers
// event handlers
- void OnSize(wxSizeEvent& event);
void OnChoiceSelected(wxCommandEvent& event);
void OnChoiceSelected(wxCommandEvent& event);
- // the choice control we use for showing the pages index
- wxChoice *m_choice;
-
// the currently selected page or wxNOT_FOUND if none
int m_selection;
// the currently selected page or wxNOT_FOUND if none
int m_selection;
@@
-107,7
+118,7
@@
private:
// choicebook event class and related stuff
// ----------------------------------------------------------------------------
// choicebook event class and related stuff
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxChoicebookEvent : public wxBookCtrlBaseEvent
+class WXDLL
IMPEXP_CORE
wxChoicebookEvent : public wxBookCtrlBaseEvent
{
public:
wxChoicebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,
{
public:
wxChoicebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,
@@
-116,27
+127,27
@@
public:
{
}
{
}
+ wxChoicebookEvent(const wxChoicebookEvent& event)
+ : wxBookCtrlBaseEvent(event)
+ {
+ }
+
+ virtual wxEvent *Clone() const { return new wxChoicebookEvent(*this); }
+
private:
private:
- DECLARE_DYNAMIC_CLASS_NO_
COPY
(wxChoicebookEvent)
+ DECLARE_DYNAMIC_CLASS_NO_
ASSIGN
(wxChoicebookEvent)
};
};
-extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED;
-extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING;
-
typedef void (wxEvtHandler::*wxChoicebookEventFunction)(wxChoicebookEvent&);
#define wxChoicebookEventHandler(func) \
typedef void (wxEvtHandler::*wxChoicebookEventFunction)(wxChoicebookEvent&);
#define wxChoicebookEventHandler(func) \
- (wxObjectEventFunction)wxStaticCastEvent(wxChoicebookEventFunction, &func)
+ (wxObjectEventFunction)
(wxEventFunction)
wxStaticCastEvent(wxChoicebookEventFunction, &func)
-#define EVT_CHOICEBOOK_PAGE_CHANGED(id, fn) \
- wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, \
- id, \
- wxChoicebookEventHandler(fn))
+#define EVT_CHOICEBOOK_PAGE_CHANGED(winid, fn) \
+ wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, winid, wxChoicebookEventHandler(fn))
-#define EVT_CHOICEBOOK_PAGE_CHANGING(id, fn) \
- wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, \
- id, \
- wxChoicebookEventHandler(fn))
+#define EVT_CHOICEBOOK_PAGE_CHANGING(winid, fn) \
+ wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, winid, wxChoicebookEventHandler(fn))
#endif // wxUSE_CHOICEBOOK
#endif // wxUSE_CHOICEBOOK