#pragma hdrstop
#endif
-#if wxUSE_COLOURDLG
+#if wxUSE_COLOURDLG && (!defined(__WXGTK20__) || defined(__WXUNIVERSAL__))
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/stattext.h"
#include "wx/layout.h"
#include "wx/dcclient.h"
- #include "wx/slider.h"
#include "wx/sizer.h"
#endif
#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)
bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data)
{
- if ( !wxDialog::Create(parent, -1, _("Choose colour"),
- wxPoint(0, 0), wxSize(900, 900)) )
- return FALSE;
+ if ( !wxDialog::Create(parent, wxID_ANY, _("Choose colour"),
+ wxPoint(0,0), wxSize(900, 900)) )
+ return false;
dialogParent = parent;
CalculateMeasurements();
CreateWidgets();
- return TRUE;
+ return true;
}
int wxGenericColourDialog::ShowModal()
void wxGenericColourDialog::OnPaint(wxPaintEvent& event)
{
-#if !defined(__WXMOTIF__) && !defined(__WXMAC__) && !defined(__WXPM__) && !defined(__WXCOCOA__)
- wxDialog::OnPaint(event);
+#if !defined(__WXMOTIF__) && !defined(__WXPM__) && !defined(__WXCOCOA__)
+ wxDialog::OnPaint(event);
+#else
+ wxUnusedVar(event);
#endif
- wxPaintDC dc(this);
+ wxPaintDC dc(this);
- PaintBasicColours(dc);
- PaintCustomColours(dc);
- PaintCustomColour(dc);
- PaintHighlight(dc, TRUE);
+ PaintBasicColours(dc);
+ PaintCustomColours(dc);
+ PaintCustomColour(dc);
+ PaintHighlight(dc, true);
}
void wxGenericColourDialog::CalculateMeasurements()
{
wxBeginBusyCursor();
- int sliderX = singleCustomColourRect.x + singleCustomColourRect.width + sectionSpacing;
-#if defined(__WXMOTIF__)
- int sliderSpacing = 65;
- int sliderHeight = 160;
-#else
- int sliderSpacing = 45;
- int sliderHeight = 160;
-#endif
+ wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL );
+
+ const int sliderHeight = 160;
- redSlider = new wxSlider(this, wxID_RED_SLIDER, singleCustomColour.Red(), 0, 255,
- wxPoint(sliderX, 10), wxSize(-1, sliderHeight), wxVERTICAL|wxSL_LABELS);
- greenSlider = new wxSlider(this, wxID_GREEN_SLIDER, singleCustomColour.Green(), 0, 255,
- wxPoint(sliderX + sliderSpacing, 10), wxSize(-1, sliderHeight), wxVERTICAL|wxSL_LABELS);
- blueSlider = new wxSlider(this, wxID_BLUE_SLIDER, singleCustomColour.Blue(), 0, 255,
- wxPoint(sliderX + 2*sliderSpacing, 10), wxSize(-1, sliderHeight), wxVERTICAL|wxSL_LABELS);
+#if wxUSE_SLIDER
+ const int sliderX = singleCustomColourRect.x + singleCustomColourRect.width + sectionSpacing;
- wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
+ redSlider = new wxSlider(this, wxID_RED_SLIDER, colourData.m_dataColour.Red(), 0, 255,
+ wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxSL_VERTICAL|wxSL_LABELS|wxSL_INVERSE);
+ greenSlider = new wxSlider(this, wxID_GREEN_SLIDER, colourData.m_dataColour.Green(), 0, 255,
+ wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxSL_VERTICAL|wxSL_LABELS|wxSL_INVERSE);
+ blueSlider = new wxSlider(this, wxID_BLUE_SLIDER, colourData.m_dataColour.Blue(), 0, 255,
+ wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxSL_VERTICAL|wxSL_LABELS|wxSL_INVERSE);
- // 1) space for explicitly layouted controls
- topsizer->Add( sliderX + 3*sliderSpacing, sliderHeight+25 );
+ wxBoxSizer *sliderSizer = new wxBoxSizer( wxHORIZONTAL );
+
+ // 1) space for sliders
+ sliderSizer->Add( sliderX, sliderHeight );
+ sliderSizer->Add( redSlider, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL, 10 );
+ sliderSizer->Add( greenSlider, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL, 10 );
+ sliderSizer->Add( blueSlider, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL, 10 );
+
+ 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
- topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
+ topSizer->Add( new wxStaticLine( this, wxID_ANY ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
#endif
// 3) buttons
wxSizer *buttonsizer = CreateButtonSizer( wxOK|wxCANCEL );
buttonsizer->Add( new wxButton(this, wxID_ADD_CUSTOM, _("Add to custom colours") ), 0, wxLEFT|wxRIGHT, 10 );
- topsizer->Add( buttonsizer, 0, wxCENTRE | wxALL, 10 );
+ topSizer->Add( buttonsizer, 0, wxEXPAND | wxALL, 10 );
- SetAutoLayout( TRUE );
- SetSizer( topsizer );
+ SetAutoLayout( true );
+ SetSizer( topSizer );
- topsizer->SetSizeHints( this );
- topsizer->Fit( this );
+ topSizer->SetSizeHints( this );
+ topSizer->Fit( this );
Centre( wxBOTH );
for (i = 0; i < WXSIZEOF(customColours); i++)
{
- customColours[i] = colourData.GetCustomColour(i);
+ wxColour c = colourData.GetCustomColour(i);
+ if (c.Ok())
+ customColours[i] = colourData.GetCustomColour(i);
+ else
+ customColours[i] = wxColour(255, 255, 255);
}
wxColour curr = colourData.GetColour();
if ( curr.Ok() )
{
- bool initColourFound = FALSE;
+ bool initColourFound = false;
for (i = 0; i < WXSIZEOF(wxColourDialogNames); i++)
{
{
whichKind = 1;
colourSelection = i;
- initColourFound = TRUE;
+ initColourFound = true;
break;
}
}
}
}
}
- singleCustomColour.Set( curr.Red(), curr.Green(), curr.Blue() );
+ colourData.m_dataColour.Set( curr.Red(), curr.Green(), curr.Blue() );
}
else
{
whichKind = 1;
colourSelection = 0;
- singleCustomColour.Set( 0, 0, 0 );
+ colourData.m_dataColour.Set( 0, 0, 0 );
}
}
dc.SetPen(*wxBLACK_PEN);
- wxBrush *brush = new wxBrush(singleCustomColour, wxSOLID);
+ wxBrush *brush = new wxBrush(colourData.m_dataColour, wxSOLID);
dc.SetBrush(*brush);
dc.DrawRectangle( singleCustomColourRect.x, singleCustomColourRect.y,
void wxGenericColourDialog::OnBasicColourClick(int which)
{
- wxClientDC dc(this);
+ wxClientDC dc(this);
- PaintHighlight(dc, FALSE);
- whichKind = 1;
- colourSelection = which;
- colourData.SetColour(standardColours[colourSelection]);
- redSlider->SetValue( standardColours[colourSelection].Red() );
+ PaintHighlight(dc, false);
+ whichKind = 1;
+ colourSelection = which;
+
+#if wxUSE_SLIDER
+ redSlider->SetValue( standardColours[colourSelection].Red() );
greenSlider->SetValue( standardColours[colourSelection].Green() );
blueSlider->SetValue( standardColours[colourSelection].Blue() );
- singleCustomColour.Set(standardColours[colourSelection].Red(), standardColours[colourSelection].Green(), standardColours[colourSelection].Blue());
+#endif // wxUSE_SLIDER
- PaintCustomColour(dc);
- PaintHighlight(dc, TRUE);
+ colourData.m_dataColour.Set(standardColours[colourSelection].Red(),
+ standardColours[colourSelection].Green(),
+ standardColours[colourSelection].Blue());
+
+ PaintCustomColour(dc);
+ PaintHighlight(dc, true);
}
void wxGenericColourDialog::OnCustomColourClick(int which)
{
- wxClientDC dc(this);
- PaintHighlight(dc, FALSE);
- whichKind = 2;
- colourSelection = which;
- colourData.SetColour(customColours[colourSelection]);
- redSlider->SetValue( customColours[colourSelection].Red() );
+ wxClientDC dc(this);
+ PaintHighlight(dc, false);
+ whichKind = 2;
+ colourSelection = which;
+
+#if wxUSE_SLIDER
+ redSlider->SetValue( customColours[colourSelection].Red() );
greenSlider->SetValue( customColours[colourSelection].Green() );
blueSlider->SetValue( customColours[colourSelection].Blue() );
- singleCustomColour.Set(customColours[colourSelection].Red(), customColours[colourSelection].Green(), customColours[colourSelection].Blue());
- PaintCustomColour(dc);
- PaintHighlight(dc, TRUE);
+#endif // wxUSE_SLIDER
+
+ colourData.m_dataColour.Set(customColours[colourSelection].Red(),
+ customColours[colourSelection].Green(),
+ customColours[colourSelection].Blue());
+
+ PaintCustomColour(dc);
+ PaintHighlight(dc, true);
}
/*
void wxGenericColourDialog::OnOk(void)
{
- Show(FALSE);
+ Show(false);
}
void wxGenericColourDialog::OnCancel(void)
{
- colourDialogCancelled = TRUE;
- Show(FALSE);
+ colourDialogCancelled = true;
+ Show(false);
}
*/
wxClientDC dc(this);
if (whichKind != 2)
{
- PaintHighlight(dc, FALSE);
+ PaintHighlight(dc, false);
whichKind = 2;
colourSelection = 0;
- PaintHighlight(dc, TRUE);
+ PaintHighlight(dc, true);
}
- customColours[colourSelection].Set(singleCustomColour.Red(), singleCustomColour.Green(), singleCustomColour.Blue());
- colourData.SetColour(customColours[colourSelection]);
+ customColours[colourSelection].Set(colourData.m_dataColour.Red(),
+ colourData.m_dataColour.Green(),
+ colourData.m_dataColour.Blue());
+
colourData.SetCustomColour(colourSelection, customColours[colourSelection]);
PaintCustomColours(dc);
}
+#if wxUSE_SLIDER
+
void wxGenericColourDialog::OnRedSlider(wxCommandEvent& WXUNUSED(event))
{
if (!redSlider)
return;
wxClientDC dc(this);
- singleCustomColour.Set(redSlider->GetValue(), singleCustomColour.Green(), singleCustomColour.Blue());
+ colourData.m_dataColour.Set((unsigned char)redSlider->GetValue(), colourData.m_dataColour.Green(), colourData.m_dataColour.Blue());
PaintCustomColour(dc);
}
return;
wxClientDC dc(this);
- singleCustomColour.Set(singleCustomColour.Red(), greenSlider->GetValue(), singleCustomColour.Blue());
+ colourData.m_dataColour.Set(colourData.m_dataColour.Red(), (unsigned char)greenSlider->GetValue(), colourData.m_dataColour.Blue());
PaintCustomColour(dc);
}
return;
wxClientDC dc(this);
- singleCustomColour.Set(singleCustomColour.Red(), singleCustomColour.Green(), blueSlider->GetValue());
+ colourData.m_dataColour.Set(colourData.m_dataColour.Red(), colourData.m_dataColour.Green(), (unsigned char)blueSlider->GetValue());
PaintCustomColour(dc);
}
-#endif // wxUSE_COLOURDLG
+#endif // wxUSE_SLIDER
+#endif // wxUSE_COLOURDLG && !defined(__WXGTK20__)
projects / wxWidgets.git / blobdiff