|
From: Emilien K. <cur...@us...> - 2005-01-13 14:33:32
|
Update of /cvsroot/wxdevcenter/StdPlugin/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8534/src Modified Files: Controls.cpp Log Message: Suppression du wxToggleBitmapButton car non utilisé et existe déjà sous GTK (d'où conflit) Index: Controls.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/Controls.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Controls.cpp 7 Jan 2005 17:41:44 -0000 1.5 --- Controls.cpp 13 Jan 2005 14:33:20 -0000 1.6 *************** *** 186,231 **** } - - /** - * Implémentation de la classe wxToggleBitmapButton - */ - - wxToggleBitmapButton::wxToggleBitmapButton(wxWindow* parent, wxWindowID id, const wxBitmap& label, const wxPoint& pos, const wxSize& size, long style): - wxStaticBitmap(parent, id, label, pos, size, style), - m_bIsToggle(false) - { - SetValue(true); - } - - BEGIN_EVENT_TABLE(wxToggleBitmapButton, wxControl) - EVT_LEFT_UP(wxToggleBitmapButton::OnMouseLeftUp) - END_EVENT_TABLE() - - - void wxToggleBitmapButton::SetValue(bool bToggle) - { - - wxLogDebug("wxToggleBitmapButton::SetValue %s", bToggle?"true":"false"); - - m_bIsToggle = bToggle; - - long style = GetWindowStyle(); - style &= ~wxBORDER_MASK; - - if(m_bIsToggle) - style |= wxRAISED_BORDER; - else - style |= wxSUNKEN_BORDER; - - SetWindowStyleFlag(style); - Refresh(); - } - - - void wxToggleBitmapButton::OnMouseLeftUp(wxMouseEvent& WXUNUSED(event)) - { - SetValue(!GetValue()); - wxCommandEvent evt(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, GetId()); - ProcessEvent(evt); - } - --- 186,187 ---- |