Commit Graph

80 Commits

Author SHA1 Message Date
Vadim Zeitlin
1c105a2e06 Fix harmless signed/unsigned comparison warnings in wxGenericColourDialog
Use unsigned type/casts.
2016-02-24 19:33:38 +01:00
Jouk
8397fe2d13 Include wx/settings.h to provide wxSystemSettings & wxSYS_COLOUR_3DFACE 2016-02-03 09:02:13 +01:00
Artur Wieczorek
183a88062a Refactor procedure to highlight selected colours in generic colour dialog.
Simplify procedure to draw frame around (un-)selected colour item by using dedicated wxRect/wxPoint methods and by removing duplicated code.
2016-01-18 20:44:16 +01:00
Artur Wieczorek
3a971a6063 Use dialog background colour to draw rectangle when removing highlight from colour item.
Use neutral dialog background colour to overpaint rectangle used to highlight colour item in generic colour dialog.
2016-01-18 20:40:40 +01:00
Artur Wieczorek
9409b7eb80 Don't use directly wxColourData data members in wxGenericColourDialog.
wxColourData data members are public for backwards compatibility only and shouldn't be used directly.
2015-11-02 23:19:33 +01:00
Artur Wieczorek
fa7c2de28d Add slider labels in wxGenericColourDialog. 2015-11-02 23:19:23 +01:00
Artur Wieczorek
880ad7f6f8 Add alpha channel support to wxGenericColourDialog.
Added opacity slider and custom colours (with alpha) previews (implemented with wxStaticBitmap controls). This feature is controlled by wxColourData::GetChooseAlpha().
2015-11-02 23:19:19 +01:00
Artur Wieczorek
3dc013920b Fix type of member variable in wxGenericColourDialog
Variable to hold the size should be of type wxSize, not wxPoint.
2015-11-02 23:19:12 +01:00
Artur Wieczorek
7399fb3428 Optimize wxGenericColourDialog
Variable to hold the size of the custom colour box doesn't need to be a member variable since it's used only locally in wxGenericColourDialog::CalculateMeasurements.
2015-11-02 23:19:09 +01:00
Dimitri Schoolwerth
2f3d0d9629 Fix invalid use of wxSizer flags in samples and utils.
Remove alignment flags that result in asserts because of being used in
combinations that don't make sense.

Also use wxSizerFlags in the lines that were changed.
2015-04-25 21:26:40 +04:00
Dimitri Schoolwerth
8f8d58d193 Use wx-prefixed macros throughout the repository.
Change {DECLARE,IMPLEMENT}_*CLASS and {DECLARE,BEGIN,END}_EVENT_TABLE
occurrences to use the wx-prefixed version of the macros.
2015-04-23 22:00:35 +04:00
Vadim Zeitlin
01f9accd19 Remove wxPM, wxWidgets port to OS/2.
This port is not used and is not being worked on, so remove it to reduce the
amount of the code which needs to be updated for every global change.

Also remove tests for VisualAge compiler which isn't used since ages.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-15 23:56:58 +00:00
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword.
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-26 16:02:46 +00:00
Vadim Zeitlin
4a699e3a59 Remove unnecessary base class OnPaint() call from wxGenericColourDialog.
Events should be skipped instead of calling the base class event handler
directly, but in this case even this is not needed as wxGenericColourDialog
takes care of processing the event completely.

Closes #14405.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-15 23:23:23 +00:00
Dimitri Schoolwerth
a1b806b982 Replaced Ok() occurrences with IsOk() throughout trunk.
Additionally renamed wxOSX' private wxNativePrinterDC::Ok() function to IsOk().

Didn't deprecate the various Ok() functions: given the amount of changes already introduced in 3.0 a trivial one like this seems more suitable for after 3.0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 16:29:04 +00:00
Paul Cornett
081d8d96db Move wxColourData and wxFontData into separate files.
This eliminates a linking dependency that would drag in the printing
code for any program that used wxColourDialog or wxFontDialog (which
is currently all of them, due to more link dependencies...)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 05:26:57 +00:00
Vadim Zeitlin
cdc48273b4 Fix bug with using uninitialized flags in GetParentForModalDialog().
GetParentForModalDialog() was called from the ctor initialized list before
m_windowStyle could be initialized by the base class ctor in several different
places, meaning that the check for wxDIALOG_NO_PARENT in this function was
using uninitialized variable.

Fix this by passing the style parameter explicitly to this function to allow
using it from derived class ctors. Still keep an overload which uses the
actual window parent and flags which is simpler to use for later calls to this
function.

Thanks valgrind for finding this one.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-18 00:05:37 +00:00
Paul Cornett
a243da29c8 make array data fully const
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-02 17:28:45 +00:00
Stefan Csomor
1e269f30d5 OSX currently doesn't expose an OnPaint anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-07 14:47:55 +00:00
Vadim Zeitlin
ff654490b7 removed all compile- and run-time checks for GTK+ < 2.4; don't include the generic files which are now never used in wxGTK in the build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-05 22:31:24 +00:00
Vadim Zeitlin
2229243bdf added wxDialog::GetParentForModalDialog() and use it to try to always create modal dialogs with a parent (slightly modified patch 1702962)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-22 20:34:41 +00:00
Vadim Zeitlin
66c59e2c54 add m_ prefix to the member variables and remove unneeded dialogParent field (part of patch 1702962)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-22 20:20:51 +00:00
Vadim Zeitlin
bd9f3519cf use wxSizerFlags and updated CreateButtonSizer() in all generic dialogs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-09 21:08:45 +00:00
Włodzimierz Skiba
f4da9a9431 Include wx/slider.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-06 16:28:58 +00:00
Jamie Gadd
68df211fae Deprecate wxDC::{Begin,End}Drawing()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 11:59:59 +00:00
Mart Raudsepp
8907154c1a Nuke #pragma implementation/interface's
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-23 12:56:45 +00:00
Włodzimierz Skiba
7a893a3152 wxOS2 with Open Watcom: correct PCH usage, missing headers, warning fixes, source cleaning and other Watcom adjustements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-21 16:22:28 +00:00
Kevin Hock
a3b8b891fb Color dialog sliders make more sense inverted, with 0 at the bottom (slide the scale UP to add color, consistent with other "generic" color dialogs in other programs).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-20 03:22:54 +00:00
Włodzimierz Skiba
c47addef10 wxPoint/Size/Rect() causes the same code with (0,0) initialization and is incomparably more readable and clear.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-16 20:34:34 +00:00
Stefan Csomor
1bf38b0eda toplevel background behaviour changed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-15 06:02:05 +00:00
Stefan Csomor
bfef8c703e changed back, as I found a source compatible way to solve the background problem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-13 16:45:34 +00:00
Stefan Csomor
6e38077e6c wxMac needs inherited on paint for the correct background as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-13 14:31:30 +00:00
Włodzimierz Skiba
2997ca30d6 Use default constructors for wxSize/Point/Rect.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-10 21:33:56 +00:00
Robert Roebling
acf2ac3757 Applied modified form of the StdButtonSize patch.
Tested on GTK2, MSW and Mac.
  Adapted various generic dialogs to stretch the
    button sizer so that the buttons don't end
    up centered but right aligned.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-31 18:57:25 +00:00
Włodzimierz Skiba
6bb44116c2 wxUSE_SLIDER=0 fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 16:08:12 +00:00
Ryan Norton
984b0d8ba7 get rid of singleCustomColour - its not needed. Cleanup/optimize a bit more.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 16:35:16 +00:00
Ryan Norton
dc2ee831d3 fix bug where color chosen by sliders wouldn't be registered. Optimized a bit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-18 16:24:11 +00:00
Włodzimierz Skiba
254a21292b Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW and DMC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-05 15:38:40 +00:00
Václav Slavík
853bbd9e35 wxUniv compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-18 22:27:42 +00:00
Włodzimierz Skiba
f79a46f83a Sizer based placement of controls in generic colour dialog (patch #991595)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-16 13:08:44 +00:00
Włodzimierz Skiba
ca65c0440a Code cleaning: wxID_ANY, wxDefaultSize, wxDefaultPosition, true, false, wxEmptyString, tabs and white spaces.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-17 16:22:36 +00:00
Václav Slavík
a2b99ff5a5 1. changed wxColourData default palette to NULL colours instead of white
2. added native wxColourDialog for GTK2


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-04 15:58:05 +00:00
Václav Slavík
e39472990e title needs to be translated, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-04 10:28:25 +00:00
Dimitri Schoolwerth
2a21ac1590 applied patch #935127: "wxDIALOG_MODAL and wxDIALOG_MODELESS cleaning"; some cosmetic cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-25 12:44:56 +00:00
Julian Smart
655719367a Use old licence name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 20:53:33 +00:00
Julian Smart
77ffb5937e Name and version changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 14:56:36 +00:00
Vadim Zeitlin
564a150b1f replaced all occurences of wxColourDatabase::FindColour() with Find(); minor code cleanup here and there
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-18 23:51:01 +00:00
Vadim Zeitlin
999836aaca warning fixes for BCC and OW (heavily modified patch 819146)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 10:28:15 +00:00
Václav Slavík
14f355c2b5 added support for gcc precompiled headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 12:46:53 +00:00
David Elliott
bec1ace627 wxCocoa does not have wxDialog::OnPaint()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-19 22:06:24 +00:00