X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..dd107c50be43e8d4dbdba20df162faf119a3781c:/src/generic/colrdlgg.cpp diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp index 4cc5493335..b097bcaa10 100644 --- a/src/generic/colrdlgg.cpp +++ b/src/generic/colrdlgg.cpp @@ -192,7 +192,7 @@ void wxGenericColourDialog::OnMouseEvent(wxMouseEvent& event) void wxGenericColourDialog::OnPaint(wxPaintEvent& event) { -#ifndef __WXMOTIF__ +#if !defined(__WXMOTIF__) && !defined(__WXMAC__) && !defined(__WXPM__) wxDialog::OnPaint(event); #endif @@ -258,7 +258,7 @@ void wxGenericColourDialog::CreateWidgets() // 1) space for explicitly layouted controls topsizer->Add( sliderX + 3*sliderSpacing, sliderHeight+25 ); - + #if wxUSE_STATLINE // 2) static line topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 ); @@ -271,7 +271,7 @@ void wxGenericColourDialog::CreateWidgets() SetAutoLayout( TRUE ); SetSizer( topsizer ); - + topsizer->SetSizeHints( this ); topsizer->Fit( this ); @@ -294,11 +294,6 @@ void wxGenericColourDialog::InitializeColours(void) for (i = 0; i < 16; i++) customColours[i] = -/* -#ifndef __VMS__ - (wxColour&) -#endif -*/ colourData.GetCustomColour(i); singleCustomColour.Set(0, 0, 0);