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

Added PushEventHandler, Pop...

Browse Source 
Corrected spelling of SetEventhandler
  Fixed two bugs in wxGenericPrintDlg
  Tried in vain to make printing of icons work.
    It now prints black on black, mostly.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-08-12 21:24:51 +00:00
parent 16ced4a272
commit 86b29a6122
9 changed files with 85 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/generic/prntdlgg.cpp
View File

@@ -93,7 +93,9 @@ wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent, wxPrintData* data):
wxString choices[2];
choices[0] = _("All");
choices[1] = _("Pages");
fromText = (wxTextCtrl*)NULL;
rangeRadioBox = new wxRadioBox(this, wxPRINTID_RANGE, _("Print Range"),
wxPoint(5, yPos), wxSize(-1, -1), 2, choices, 2);
rangeRadioBox->SetSelection(1);
@@ -186,12 +188,14 @@ void wxGenericPrintDialog::OnOK(wxCommandEvent& WXUNUSED(event))
void wxGenericPrintDialog::OnRange(wxCommandEvent& event)
{
if (event.GetInt() == 0)
if (!fromText) return;
if (event.GetInt() == 1)
{
fromText->Enable(FALSE);
toText->Enable(FALSE);
}
else if (event.GetInt() == 1)
else if (event.GetInt() == 0)
{
fromText->Enable(TRUE);
toText->Enable(TRUE);

28
src/gtk/window.cpp
View File

@@ -1544,11 +1544,37 @@ wxEvtHandler *wxWindow::GetEventHandler(void)
return m_eventHandler;
}
void wxWindow::SetEventhandler( wxEvtHandler *handler )
void wxWindow::SetEventHandler( wxEvtHandler *handler )
{
m_eventHandler = handler;
}
void wxWindow::PushEventHandler(wxEvtHandler *handler)
{
handler->SetNextHandler(GetEventHandler());
SetEventHandler(handler);
}
wxEvtHandler *wxWindow::PopEventHandler(bool deleteHandler)
{
if ( GetEventHandler() )
{
wxEvtHandler *handlerA = GetEventHandler();
wxEvtHandler *handlerB = handlerA->GetNextHandler();
handlerA->SetNextHandler(NULL);
SetEventHandler(handlerB);
if ( deleteHandler )
{
delete handlerA;
return NULL;
}
else
return handlerA;
}
else
return NULL;
}
wxValidator *wxWindow::GetValidator(void)
{
return m_windowValidator;

28
src/gtk1/window.cpp
View File

@@ -1544,11 +1544,37 @@ wxEvtHandler *wxWindow::GetEventHandler(void)
return m_eventHandler;
}
void wxWindow::SetEventhandler( wxEvtHandler *handler )
void wxWindow::SetEventHandler( wxEvtHandler *handler )
{
m_eventHandler = handler;
}
void wxWindow::PushEventHandler(wxEvtHandler *handler)
{
handler->SetNextHandler(GetEventHandler());
SetEventHandler(handler);
}
wxEvtHandler *wxWindow::PopEventHandler(bool deleteHandler)
{
if ( GetEventHandler() )
{
wxEvtHandler *handlerA = GetEventHandler();
wxEvtHandler *handlerB = handlerA->GetNextHandler();
handlerA->SetNextHandler(NULL);
SetEventHandler(handlerB);
if ( deleteHandler )
{
delete handlerA;
return NULL;
}
else
return handlerA;
}
else
return NULL;
}
wxValidator *wxWindow::GetValidator(void)
{
return m_windowValidator;