[Wxdevcenter-cvs] StdPlugin/src Controls.cpp,1.1,1.2

[Emilien K. <cur...@us...>]

Update of /cvsroot/wxdevcenter/StdPlugin/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23015/src

Modified Files:
	Controls.cpp 
Log Message:
Oups : placement et ID pour les interception d'évènements

Index: Controls.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/src/Controls.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Controls.cpp	6 Jan 2005 14:55:52 -0000	1.1
--- Controls.cpp	6 Jan 2005 15:07:48 -0000	1.2
***************
*** 24,29 ****
      m_pSlider = new wxSlider(this, ID_SSC_SLIDER, value, minValue, maxValue, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL);
      m_pSpin   = new wxSpinCtrl(this, ID_SSC_SPIN, wxString::Format(wxT("%d"), value), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, minValue, maxValue, value);
!     pHSizer->Add(m_pSlider, 2, wxGROW);
!     pHSizer->Add(m_pSpin, 1, wxGROW);
      SetSizer(pHSizer);
  }
--- 24,30 ----
      m_pSlider = new wxSlider(this, ID_SSC_SLIDER, value, minValue, maxValue, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL);
      m_pSpin   = new wxSpinCtrl(this, ID_SSC_SPIN, wxString::Format(wxT("%d"), value), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, minValue, maxValue, value);
! 
!     pHSizer->Add(m_pSlider, 2, wxALIGN_CENTER_VERTICAL);
!     pHSizer->Add(m_pSpin, 1, wxALIGN_CENTER_VERTICAL);
      SetSizer(pHSizer);
  }
***************
*** 31,36 ****
  BEGIN_EVENT_TABLE(wxSliderSpinCtrl, wxControl)
      EVT_COMMAND_SCROLL(ID_SSC_SLIDER, wxSliderSpinCtrl::OnSliderChanged)
!     EVT_SPINCTRL(ID_SSC_SLIDER, wxSliderSpinCtrl::OnSpinChange)
!     EVT_TEXT(ID_SSC_SLIDER, wxSliderSpinCtrl::OnSpinTextChange)
  END_EVENT_TABLE()
  
--- 32,38 ----
  BEGIN_EVENT_TABLE(wxSliderSpinCtrl, wxControl)
      EVT_COMMAND_SCROLL(ID_SSC_SLIDER, wxSliderSpinCtrl::OnSliderChanged)
!     EVT_SPINCTRL(ID_SSC_SPIN, wxSliderSpinCtrl::OnSpinChange)
!     EVT_TEXT(ID_SSC_SPIN, wxSliderSpinCtrl::OnSpinTextChange)
!     EVT_SIZE(wxSliderSpinCtrl::OnSize)
  END_EVENT_TABLE()
  
***************
*** 69,72 ****
--- 71,81 ----
  }
  
+ 
+ void wxSliderSpinCtrl::OnSize(wxSizeEvent& event)
+ {
+     Layout();
+     event.Skip();
+ }
+ 
  void wxSliderSpinCtrl::OnSpinChange(wxSpinEvent& event)
  {