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

wxUSE_SLIDER=0 fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-11-24 16:08:12 +00:00
parent 455a9ca633
commit 6bb44116c2
3 changed files with 51 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/generic/colrdlgg.h
View File

@@ -22,11 +22,17 @@
#include "wx/cmndata.h"
#define wxID_ADD_CUSTOM 3000
#if wxUSE_SLIDER
#define wxID_RED_SLIDER 3001
#define wxID_GREEN_SLIDER 3002
#define wxID_BLUE_SLIDER 3003
class WXDLLEXPORT wxSlider;
#endif // wxUSE_SLIDER
class WXDLLEXPORT wxGenericColourDialog : public wxDialog
{
public:
@@ -59,9 +65,11 @@ public:
void OnAddCustom(wxCommandEvent& event);
#if wxUSE_SLIDER
void OnRedSlider(wxCommandEvent& event);
void OnGreenSlider(wxCommandEvent& event);
void OnBlueSlider(wxCommandEvent& event);
#endif // wxUSE_SLIDER
void OnCloseWindow(wxCloseEvent& event);
@@ -96,9 +104,11 @@ protected:
int colourSelection;
int whichKind; // 1 for standard colours, 2 for custom colours,
#if wxUSE_SLIDER
wxSlider *redSlider;
wxSlider *greenSlider;
wxSlider *blueSlider;
#endif // wxUSE_SLIDER
int buttonY;

16
samples/controls/controls.cpp
View File

@@ -125,7 +125,9 @@ public:
wxRadioBox *m_radio;
wxGauge *m_gauge,
*m_gaugeVert;
#if wxUSE_SLIDER
wxSlider *m_slider;
#endif // wxUSE_SLIDER
wxButton *m_fontButton;
wxButton *m_lbSelectNum;
wxButton *m_lbSelectThis;
@@ -398,7 +400,9 @@ const int ID_RADIOBUTTON_2 = 167;
const int ID_SET_FONT = 170;
const int ID_GAUGE = 180;
#if wxUSE_SLIDER
const int ID_SLIDER = 181;
#endif // wxUSE_SLIDER
const int ID_SPIN = 182;
const int ID_BTNPROGRESS = 183;
@@ -461,7 +465,9 @@ EVT_CHECKBOX (ID_RADIOBOX_ENABLE, MyPanel::OnRadioButtons)
EVT_RADIOBUTTON(ID_RADIOBUTTON_1, MyPanel::OnRadioButton1)
EVT_RADIOBUTTON(ID_RADIOBUTTON_2, MyPanel::OnRadioButton2)
EVT_BUTTON (ID_SET_FONT, MyPanel::OnSetFont)
#if wxUSE_SLIDER
EVT_SLIDER (ID_SLIDER, MyPanel::OnSliderUpdate)
#endif // wxUSE_SLIDER
#if wxUSE_SPINBTN
EVT_SPIN (ID_SPIN, MyPanel::OnSpinUpdate)
EVT_SPIN_UP (ID_SPIN, MyPanel::OnSpinUp)
@@ -523,12 +529,14 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
#if wxUSE_CHOICE
m_choice = NULL;
m_choiceSorted = NULL;
#endif
#endif // wxUSE_CHOICE
m_combo = NULL;
m_radio = NULL;
m_gauge = NULL;
m_gaugeVert = NULL;
#if wxUSE_SLIDER
m_slider = NULL;
#endif // wxUSE_SLIDER
m_fontButton = NULL;
m_lbSelectNum = NULL;
m_lbSelectThis = NULL;
@@ -728,6 +736,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
(void)new wxRadioButton( panel, ID_RADIOBUTTON_2, _T("&Radiobutton2"), wxPoint(340,170), wxDefaultSize );
m_book->AddPage(panel, _T("wxRadioBox"), false, Image_Radio);
#if wxUSE_SLIDER && wxUSE_GAUGE
panel = new wxPanel(m_book);
(void)new wxStaticBox( panel, wxID_ANY, _T("&wxGauge and wxSlider"), wxPoint(10,10), wxSize(222,130) );
m_gauge = new wxGauge( panel, wxID_ANY, 200, wxPoint(18,50), wxSize(155, 30), wxGA_HORIZONTAL|wxNO_BORDER );
@@ -786,6 +795,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
#endif // wxUSE_SPINCTRL
m_book->AddPage(panel, _T("wxGauge"), false, Image_Gauge);
#endif // wxUSE_SLIDER && wxUSE_GAUGE
panel = new wxPanel(m_book);
@@ -1312,12 +1322,16 @@ void MyPanel::OnUpdateLabel( wxCommandEvent &event )
: _T("Shorter text."));
}
#if wxUSE_SLIDER
void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) )
{
m_gauge->SetValue( m_slider->GetValue() );
m_gaugeVert->SetValue( m_slider->GetValue() / 2 );
}
#endif // wxUSE_SLIDER
#if wxUSE_SPINCTRL
void MyPanel::OnSpinCtrlText(wxCommandEvent& event)

26
src/generic/colrdlgg.cpp
View File

@@ -31,7 +31,6 @@
#include "wx/stattext.h"
#include "wx/layout.h"
#include "wx/dcclient.h"
#include "wx/slider.h"
#include "wx/sizer.h"
#endif
@@ -39,15 +38,21 @@
#include "wx/statline.h"
#endif
#if wxUSE_SLIDER
#include "wx/slider.h"
#endif
#include "wx/generic/colrdlgg.h"
IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
BEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog)
EVT_BUTTON(wxID_ADD_CUSTOM, wxGenericColourDialog::OnAddCustom)
#if wxUSE_SLIDER
EVT_SLIDER(wxID_RED_SLIDER, wxGenericColourDialog::OnRedSlider)
EVT_SLIDER(wxID_GREEN_SLIDER, wxGenericColourDialog::OnGreenSlider)
EVT_SLIDER(wxID_BLUE_SLIDER, wxGenericColourDialog::OnBlueSlider)
#endif
EVT_PAINT(wxGenericColourDialog::OnPaint)
EVT_MOUSE_EVENTS(wxGenericColourDialog::OnMouseEvent)
EVT_CLOSE(wxGenericColourDialog::OnCloseWindow)
@@ -255,9 +260,13 @@ void wxGenericColourDialog::CreateWidgets()
{
wxBeginBusyCursor();
const int sliderX = singleCustomColourRect.x + singleCustomColourRect.width + sectionSpacing;
wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL );
const int sliderHeight = 160;
#if wxUSE_SLIDER
const int sliderX = singleCustomColourRect.x + singleCustomColourRect.width + sectionSpacing;
redSlider = new wxSlider(this, wxID_RED_SLIDER, colourData.m_dataColour.Red(), 0, 255,
wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxVERTICAL|wxSL_LABELS);
greenSlider = new wxSlider(this, wxID_GREEN_SLIDER, colourData.m_dataColour.Green(), 0, 255,
@@ -273,9 +282,10 @@ void wxGenericColourDialog::CreateWidgets()
sliderSizer->Add( greenSlider, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL, 10 );
sliderSizer->Add( blueSlider, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL, 10 );
wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL );
topSizer->Add( sliderSizer, 0, wxCENTRE | wxALL, 10 );
#else
topSizer->Add( 1, sliderHeight, 0, wxCENTRE | wxALL, 15 );
#endif // wxUSE_SLIDER
#if wxUSE_STATLINE
// 2) static line
@@ -484,9 +494,11 @@ void wxGenericColourDialog::OnBasicColourClick(int which)
whichKind = 1;
colourSelection = which;
#if wxUSE_SLIDER
redSlider->SetValue( standardColours[colourSelection].Red() );
greenSlider->SetValue( standardColours[colourSelection].Green() );
blueSlider->SetValue( standardColours[colourSelection].Blue() );
#endif // wxUSE_SLIDER
colourData.m_dataColour.Set(standardColours[colourSelection].Red(),
standardColours[colourSelection].Green(),
@@ -503,9 +515,11 @@ void wxGenericColourDialog::OnCustomColourClick(int which)
whichKind = 2;
colourSelection = which;
#if wxUSE_SLIDER
redSlider->SetValue( customColours[colourSelection].Red() );
greenSlider->SetValue( customColours[colourSelection].Green() );
blueSlider->SetValue( customColours[colourSelection].Blue() );
#endif // wxUSE_SLIDER
colourData.m_dataColour.Set(customColours[colourSelection].Red(),
customColours[colourSelection].Green(),
@@ -548,6 +562,8 @@ void wxGenericColourDialog::OnAddCustom(wxCommandEvent& WXUNUSED(event))
PaintCustomColours(dc);
}
#if wxUSE_SLIDER
void wxGenericColourDialog::OnRedSlider(wxCommandEvent& WXUNUSED(event))
{
if (!redSlider)
@@ -578,5 +594,7 @@ void wxGenericColourDialog::OnBlueSlider(wxCommandEvent& WXUNUSED(event))
PaintCustomColour(dc);
}
#endif // wxUSE_SLIDER
#endif // wxUSE_COLOURDLG && !defined(__WXGTK20__)