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

reSWIGged

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-10-11 04:44:52 +00:00
parent 79bcf6f487
commit bc07ab17bf
4 changed files with 50 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
include/wx/aui/framemanager.h
View File

@@ -792,12 +792,12 @@ public:
// wx event machinery // wx event machinery
BEGIN_DECLARE_EVENT_TYPES() BEGIN_DECLARE_EVENT_TYPES()
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_PANEBUTTON, 0) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_BUTTON, 0)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_PANECLOSE, 0) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_CLOSE, 0)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_PANEMAXIMIZE, 0) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_MAXIMIZE, 0)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_PANERESTORE, 0) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_RESTORE, 0)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_RENDER, 0) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_RENDER, 0)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_FINDMANAGER, 0) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_AUI_FIND_MANAGER, 0)
END_DECLARE_EVENT_TYPES() END_DECLARE_EVENT_TYPES()
typedef void (wxEvtHandler::*wxAuiManagerEventFunction)(wxAuiManagerEvent&); typedef void (wxEvtHandler::*wxAuiManagerEventFunction)(wxAuiManagerEvent&);
@@ -805,35 +805,35 @@ typedef void (wxEvtHandler::*wxAuiManagerEventFunction)(wxAuiManagerEvent&);
#define wxAuiManagerEventHandler(func) \ #define wxAuiManagerEventHandler(func) \
(wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxAuiManagerEventFunction, &func) (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxAuiManagerEventFunction, &func)
#define EVT_AUI_PANEBUTTON(func) \ #define EVT_AUI_PANE_BUTTON(func) \
wx__DECLARE_EVT0(wxEVT_AUI_PANEBUTTON, wxAuiManagerEventHandler(func)) wx__DECLARE_EVT0(wxEVT_AUI_PANE_BUTTON, wxAuiManagerEventHandler(func))
#define EVT_AUI_PANECLOSE(func) \ #define EVT_AUI_PANE_CLOSE(func) \
wx__DECLARE_EVT0(wxEVT_AUI_PANECLOSE, wxAuiManagerEventHandler(func)) wx__DECLARE_EVT0(wxEVT_AUI_PANE_CLOSE, wxAuiManagerEventHandler(func))
#define EVT_AUI_PANEMAXIMIZE(func) \ #define EVT_AUI_PANE_MAXIMIZE(func) \
wx__DECLARE_EVT0(wxEVT_AUI_PANEMAXIMIZE, wxAuiManagerEventHandler(func)) wx__DECLARE_EVT0(wxEVT_AUI_PANE_MAXIMIZE, wxAuiManagerEventHandler(func))
#define EVT_AUI_PANERESTORE(func) \ #define EVT_AUI_PANE_RESTORE(func) \
wx__DECLARE_EVT0(wxEVT_AUI_PANERESTORE, wxAuiManagerEventHandler(func)) wx__DECLARE_EVT0(wxEVT_AUI_PANE_RESTORE, wxAuiManagerEventHandler(func))
#define EVT_AUI_RENDER(func) \ #define EVT_AUI_RENDER(func) \
wx__DECLARE_EVT0(wxEVT_AUI_RENDER, wxAuiManagerEventHandler(func)) wx__DECLARE_EVT0(wxEVT_AUI_RENDER, wxAuiManagerEventHandler(func))
#define EVT_AUI_FINDMANAGER(func) \ #define EVT_AUI_FIND_MANAGER(func) \
wx__DECLARE_EVT0(wxEVT_AUI_FINDMANAGER, wxAuiManagerEventHandler(func)) wx__DECLARE_EVT0(wxEVT_AUI_FIND_MANAGER, wxAuiManagerEventHandler(func))
#else #else
%constant wxEventType wxEVT_AUI_PANEBUTTON; %constant wxEventType wxEVT_AUI_PANE_BUTTON;
%constant wxEventType wxEVT_AUI_PANECLOSE; %constant wxEventType wxEVT_AUI_PANE_CLOSE;
%constant wxEventType wxEVT_AUI_PANEMAXIMIZE; %constant wxEventType wxEVT_AUI_PANE_MAXIMIZE;
%constant wxEventType wxEVT_AUI_PANERESTORE; %constant wxEventType wxEVT_AUI_PANE_RESTORE;
%constant wxEventType wxEVT_AUI_RENDER; %constant wxEventType wxEVT_AUI_RENDER;
%constant wxEventType wxEVT_AUI_FINDMANAGER; %constant wxEventType wxEVT_AUI_FIND_MANAGER;
%pythoncode { %pythoncode {
EVT_AUI_PANEBUTTON = wx.PyEventBinder( wxEVT_AUI_PANEBUTTON ) EVT_AUI_PANE_BUTTON = wx.PyEventBinder( wxEVT_AUI_PANE_BUTTON )
EVT_AUI_PANECLOSE = wx.PyEventBinder( wxEVT_AUI_PANECLOSE ) EVT_AUI_PANE_CLOSE = wx.PyEventBinder( wxEVT_AUI_PANE_CLOSE )
EVT_AUI_PANEMAXIMIZE = wx.PyEventBinder( wxEVT_AUI_PANEMAXIMIZE ) EVT_AUI_PANE_MAXIMIZE = wx.PyEventBinder( wxEVT_AUI_PANE_MAXIMIZE )
EVT_AUI_PANERESTORE = wx.PyEventBinder( wxEVT_AUI_PANERESTORE ) EVT_AUI_PANE_RESTORE = wx.PyEventBinder( wxEVT_AUI_PANE_RESTORE )
EVT_AUI_RENDER = wx.PyEventBinder( wxEVT_AUI_RENDER ) EVT_AUI_RENDER = wx.PyEventBinder( wxEVT_AUI_RENDER )
EVT_AUI_FINDMANAGER = wx.PyEventBinder( wxEVT_AUI_FINDMANAGER ) EVT_AUI_FIND_MANAGER = wx.PyEventBinder( wxEVT_AUI_FIND_MANAGER )
} }
#endif // SWIG #endif // SWIG

2
samples/aui/auidemo.cpp
View File

@@ -626,7 +626,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_UPDATE_UI(ID_HorizontalGradient, MyFrame::OnUpdateUI) EVT_UPDATE_UI(ID_HorizontalGradient, MyFrame::OnUpdateUI)
EVT_MENU_RANGE(MyFrame::ID_FirstPerspective, MyFrame::ID_FirstPerspective+1000, EVT_MENU_RANGE(MyFrame::ID_FirstPerspective, MyFrame::ID_FirstPerspective+1000,
MyFrame::OnRestorePerspective) MyFrame::OnRestorePerspective)
EVT_AUI_PANECLOSE(MyFrame::OnPaneClose) EVT_AUI_PANE_CLOSE(MyFrame::OnPaneClose)
EVT_AUINOTEBOOK_ALLOW_DND(wxID_ANY, MyFrame::OnAllowNotebookDnD) EVT_AUINOTEBOOK_ALLOW_DND(wxID_ANY, MyFrame::OnAllowNotebookDnD)
EVT_AUINOTEBOOK_PAGE_CLOSE(wxID_ANY, MyFrame::OnNotebookPageClose) EVT_AUINOTEBOOK_PAGE_CLOSE(wxID_ANY, MyFrame::OnNotebookPageClose)
END_EVENT_TABLE() END_EVENT_TABLE()

11
src/aui/floatpane.cpp
View File

@@ -92,6 +92,17 @@ void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane)
Layer(0).Row(0).Position(0); Layer(0).Row(0).Position(0);
// Carry over the minimum size // Carry over the minimum size
wxSize pane_min_size = pane.window->GetMinSize();
// if the frame window's max size is greater than the min size
// then set the max size to the min size as well
wxSize cur_max_size = GetMaxSize();
if (cur_max_size.x < pane.min_size.x ||
cur_max_size.y < pane.min_size.y)
{
SetMaxSize(pane_min_size);
}
SetMinSize(pane.window->GetMinSize()); SetMinSize(pane.window->GetMinSize());
m_mgr.AddPane(m_pane_window, contained_pane); m_mgr.AddPane(m_pane_window, contained_pane);

26
src/aui/framemanager.cpp
View File

@@ -52,12 +52,12 @@ WX_DEFINE_OBJARRAY(wxAuiPaneInfoArray)
wxAuiPaneInfo wxAuiNullPaneInfo; wxAuiPaneInfo wxAuiNullPaneInfo;
wxAuiDockInfo wxAuiNullDockInfo; wxAuiDockInfo wxAuiNullDockInfo;
DEFINE_EVENT_TYPE(wxEVT_AUI_PANEBUTTON) DEFINE_EVENT_TYPE(wxEVT_AUI_PANE_BUTTON)
DEFINE_EVENT_TYPE(wxEVT_AUI_PANECLOSE) DEFINE_EVENT_TYPE(wxEVT_AUI_PANE_CLOSE)
DEFINE_EVENT_TYPE(wxEVT_AUI_PANEMAXIMIZE) DEFINE_EVENT_TYPE(wxEVT_AUI_PANE_MAXIMIZE)
DEFINE_EVENT_TYPE(wxEVT_AUI_PANERESTORE) DEFINE_EVENT_TYPE(wxEVT_AUI_PANE_RESTORE)
DEFINE_EVENT_TYPE(wxEVT_AUI_RENDER) DEFINE_EVENT_TYPE(wxEVT_AUI_RENDER)
DEFINE_EVENT_TYPE(wxEVT_AUI_FINDMANAGER) DEFINE_EVENT_TYPE(wxEVT_AUI_FIND_MANAGER)
#ifdef __WXMAC__ #ifdef __WXMAC__
// a few defines to avoid nameclashes // a few defines to avoid nameclashes
@@ -477,7 +477,7 @@ static int PaneSortFunc(wxAuiPaneInfo** p1, wxAuiPaneInfo** p2)
BEGIN_EVENT_TABLE(wxAuiManager, wxEvtHandler) BEGIN_EVENT_TABLE(wxAuiManager, wxEvtHandler)
EVT_AUI_PANEBUTTON(wxAuiManager::OnPaneButton) EVT_AUI_PANE_BUTTON(wxAuiManager::OnPaneButton)
EVT_AUI_RENDER(wxAuiManager::OnRender) EVT_AUI_RENDER(wxAuiManager::OnRender)
EVT_PAINT(wxAuiManager::OnPaint) EVT_PAINT(wxAuiManager::OnPaint)
EVT_ERASE_BACKGROUND(wxAuiManager::OnEraseBackground) EVT_ERASE_BACKGROUND(wxAuiManager::OnEraseBackground)
@@ -488,7 +488,7 @@ BEGIN_EVENT_TABLE(wxAuiManager, wxEvtHandler)
EVT_MOTION(wxAuiManager::OnMotion) EVT_MOTION(wxAuiManager::OnMotion)
EVT_LEAVE_WINDOW(wxAuiManager::OnLeaveWindow) EVT_LEAVE_WINDOW(wxAuiManager::OnLeaveWindow)
EVT_CHILD_FOCUS(wxAuiManager::OnChildFocus) EVT_CHILD_FOCUS(wxAuiManager::OnChildFocus)
EVT_AUI_FINDMANAGER(wxAuiManager::OnFindManager) EVT_AUI_FIND_MANAGER(wxAuiManager::OnFindManager)
EVT_TIMER(101, wxAuiManager::OnHintFadeTimer) EVT_TIMER(101, wxAuiManager::OnHintFadeTimer)
END_EVENT_TABLE() END_EVENT_TABLE()
@@ -647,7 +647,7 @@ wxFrame* wxAuiManager::GetFrame() const
// need to be managed by the manager itself. // need to be managed by the manager itself.
wxAuiManager* wxAuiManager::GetManager(wxWindow* window) wxAuiManager* wxAuiManager::GetManager(wxWindow* window)
{ {
wxAuiManagerEvent evt(wxEVT_AUI_FINDMANAGER); wxAuiManagerEvent evt(wxEVT_AUI_FIND_MANAGER);
evt.SetManager(NULL); evt.SetManager(NULL);
evt.ResumePropagation(wxEVENT_PROPAGATE_MAX); evt.ResumePropagation(wxEVENT_PROPAGATE_MAX);
if (!window->ProcessEvent(evt)) if (!window->ProcessEvent(evt))
@@ -3450,7 +3450,7 @@ void wxAuiManager::OnFloatingPaneClosed(wxWindow* wnd, wxCloseEvent& evt)
// fire pane close event // fire pane close event
wxAuiManagerEvent e(wxEVT_AUI_PANECLOSE); wxAuiManagerEvent e(wxEVT_AUI_PANE_CLOSE);
e.SetPane(&pane); e.SetPane(&pane);
e.SetCanVeto(evt.CanVeto()); e.SetCanVeto(evt.CanVeto());
ProcessMgrEvent(e); ProcessMgrEvent(e);
@@ -4013,7 +4013,7 @@ void wxAuiManager::OnLeftUp(wxMouseEvent& event)
if (m_action_part == HitTest(event.GetX(), event.GetY())) if (m_action_part == HitTest(event.GetX(), event.GetY()))
{ {
// fire button-click event // fire button-click event
wxAuiManagerEvent e(wxEVT_AUI_PANEBUTTON); wxAuiManagerEvent e(wxEVT_AUI_PANE_BUTTON);
e.SetManager(this); e.SetManager(this);
e.SetPane(m_action_part->pane); e.SetPane(m_action_part->pane);
e.SetButton(m_action_part->button->button_id); e.SetButton(m_action_part->button->button_id);
@@ -4263,7 +4263,7 @@ void wxAuiManager::OnPaneButton(wxAuiManagerEvent& evt)
if (evt.button == wxAUI_BUTTON_CLOSE) if (evt.button == wxAUI_BUTTON_CLOSE)
{ {
// fire pane close event // fire pane close event
wxAuiManagerEvent e(wxEVT_AUI_PANECLOSE); wxAuiManagerEvent e(wxEVT_AUI_PANE_CLOSE);
e.SetManager(this); e.SetManager(this);
e.SetPane(evt.pane); e.SetPane(evt.pane);
ProcessMgrEvent(e); ProcessMgrEvent(e);
@@ -4277,7 +4277,7 @@ void wxAuiManager::OnPaneButton(wxAuiManagerEvent& evt)
else if (evt.button == wxAUI_BUTTON_MAXIMIZE_RESTORE && !pane.IsMaximized()) else if (evt.button == wxAUI_BUTTON_MAXIMIZE_RESTORE && !pane.IsMaximized())
{ {
// fire pane close event // fire pane close event
wxAuiManagerEvent e(wxEVT_AUI_PANEMAXIMIZE); wxAuiManagerEvent e(wxEVT_AUI_PANE_MAXIMIZE);
e.SetManager(this); e.SetManager(this);
e.SetPane(evt.pane); e.SetPane(evt.pane);
ProcessMgrEvent(e); ProcessMgrEvent(e);
@@ -4291,7 +4291,7 @@ void wxAuiManager::OnPaneButton(wxAuiManagerEvent& evt)
else if (evt.button == wxAUI_BUTTON_MAXIMIZE_RESTORE && pane.IsMaximized()) else if (evt.button == wxAUI_BUTTON_MAXIMIZE_RESTORE && pane.IsMaximized())
{ {
// fire pane close event // fire pane close event
wxAuiManagerEvent e(wxEVT_AUI_PANERESTORE); wxAuiManagerEvent e(wxEVT_AUI_PANE_RESTORE);
e.SetManager(this); e.SetManager(this);
e.SetPane(evt.pane); e.SetPane(evt.pane);
ProcessMgrEvent(e); ProcessMgrEvent(e);