Amebis/wxWidgets
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,997 Commits 1 Branch 330 Tags
ec46f55266b4fb4cbff4b99a289eb72e915bfddd
Commit Graph

92 Commits

Author SHA1 Message Date
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
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
b4354db179 Refactor wxButton and wxToggleButton to derive from wxAnyButton. 
Introduce wxAnyButton class, a common base class for wxButton and
wxToggleButton, allowing to reuse the same implementation for them.

This also allows to implement support for bitmaps in wxToggleButton for all
platforms and make wxBitmapToggleButton a trivial subclass of it everywhere,
similarly to wxBitmapButton and wxButton.

Closes #13198.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-06-14 13:00:42 +00:00
Vadim Zeitlin
ad94cb2b4f Fix assert when creating wxBitmapButton without a valid bitmap in wxMSW. 
wxBitmapButton can be created without a valid bitmap if SetBitmapLabel() is
called later, so don't call SetBitmapLabel() from the constructor if no bitmap
was provided.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-05-03 23:31:15 +00:00
Stefan Csomor
2895324520 merging back XTI branch part 2 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-01-04 08:31:53 +00:00
Vadim Zeitlin
e9f935cb70 Fix wxBitmapButton initial best size determination in wxMSW. 
This was broken during wxButton/wxBitmapButton merge and wxBitmapButton was
not created with the correct initial size if the default size was specified
when creating it any longer. Fix this by calling SetInitialSize() once again
after setting the bitmap.

See #12323.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-08-10 18:58:06 +00:00
Paul Cornett
b4bde7a74b build fixes for wxUSE_VALIDATORS==0 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-09-23 16:32:32 +00:00
Vadim Zeitlin
8e4c291246 always use wxBU_NOTEXT and wxBU_EXACTFIT for wxBitmapButton under all platforms (which required some refactoring) (hopefully really closes #10927) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-06-28 16:14:37 +00:00
Vadim Zeitlin
4d51143c5e suppress harmless gcc warning about not handling all enum values in a switch 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-06-17 22:14:47 +00:00
Vadim Zeitlin
a21175918e added wxBU_NOTEXT style to allow creating bitmap buttons with stock id not showing the label, as it was possible before 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-06-17 22:13:46 +00:00
Vadim Zeitlin
a6fd73d33a implement wxBitmapButton as just a wrapper for wxButton under MSW 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-06-15 23:10:16 +00:00
Vadim Zeitlin
2352862a7e preparation work for implementing images support in wxButton: move wxBitmapButton methods to the base class (enhancing/completing them in the process); there are no functionality changes yet (hopefully) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-06-14 22:55:24 +00:00
Vadim Zeitlin
56c74796a6 clean up wxBitmapButton::Create(); override MSWGetStyle() (#4804) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-07-16 01:08:52 +00:00
Vadim Zeitlin
dca0f65178 more /Wp64 warning fixes: mostly use UINT_PTR instead of UINT and define our WX[WL]PARAM with __w64 if available to avoid hundreds of warnings when casting LPARAMs to pointers/handles 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-02-28 02:22:52 +00:00
Vadim Zeitlin
025f7d775c don't include wx/msw/dc.h from wx/msw/private.h, this results in circular inclusion of wx/stream.h from wx/filefn.h before wxFileOffset is defined which results in compilation errors under WinCE and is bad/confusing anyhow 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-02-24 22:32:23 +00:00
Vadim Zeitlin
cf2810aa39 use wxWindowIDRef to transparently implement auto-generated ids ref-counting (slightly modified patch 1835458) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-01-06 14:38:44 +00:00
Vadim Zeitlin
e040a4ff2c fix assert for bitmaps buttons created without bitmap initially 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-09-12 00:21:48 +00:00
Vadim Zeitlin
5f1f21d2a5 create greyed image for wxBitmapButton in MSW automatically, as in wxGTK (replaces patch 1734018) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-07-15 19:29:20 +00:00
Vadim Zeitlin
94aff5ff86 Call wxTLW::SetDefaultItem() from wxButtonBase::SetDefault() instead of doing 
it in wxButton implementations in (almost) all ports; changed its return type
to "wxWindow *" from "void" to accommodate the ports needing the old default
item (replaces part of patch 1696563)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-04-08 22:18:35 +00:00
Robin Dunn
170acdc90e GetBestFittingSize --> GetEffectiveMinSize 
SetBestFittingSize --> SetInitialSize
SetBestSize  --> SetInitialSize
SetInitialBestSize --> SetInitialSize


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-31 08:50:17 +00:00
Vadim Zeitlin
71c1dbbd54 don't release the DC which we don't own in wxUSE_UXTHEME case 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-09-22 00:50:53 +00:00
Włodzimierz Skiba
155ecd4c42 Include wx/image.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-07-03 19:02:54 +00:00
Vadim Zeitlin
aceeebce6d added back 2 extra pixels for the best size under XP 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-06-24 09:10:02 +00:00
Vadim Zeitlin
d381e983eb more tweaks to bitmap button borders: 
- we don't seem to need the extra +2 after Jamie's fix for the min size
- we shouldn't use margins at all for buttons without border, this looks bad
- refactored the code slightly to avoid some duplication


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-06-22 17:22:13 +00:00
Jamie Gadd
9d1b7527cd Add required padding to DoGetBestSize() for small bitmaps when using themes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-06-19 23:50:18 +00:00
Vadim Zeitlin
1d39a12a30 more tweaks to the margins: don't need them to be so big in vertical direction 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-06-19 08:24:39 +00:00
Vadim Zeitlin
0d1c8f39ba bitmap button size was too small when uxtheme functions were used to get the margins 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-06-15 16:01:17 +00:00
Włodzimierz Skiba
3700569251 uxtheme.h provides symbols regardless wxUSE_UXTHEME flag. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-06-01 23:56:23 +00:00
Robin Dunn
4e9da8b79e Forward port of changes for using themed drawing of owner-drawn buttons. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-31 21:26:39 +00:00
Włodzimierz Skiba
910b005366 Include wx/wx/bmpbuttn.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-26 18:47:45 +00:00
Vadim Zeitlin
7d09b97f53 disallow creation of wxDC objects and made wxDC an ABC; use wxDCTemp instead of wxDC in wx code; fixed WinCE bug with deleting a DC which should be released in wxListBox::MSWOnMeasure() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-12-25 02:34:42 +00:00
Włodzimierz Skiba
a71d815bbe __WIN95__ removed (used to differ win3.1 vs. 'modern' 95 look, nowadays always defined for WXMSW so useless). Minor cleanings and corrections for correct #includes. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-12-19 10:47:44 +00:00
Vadim Zeitlin
7996ff8038 use focused bitmap as fallback for the hover one 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-11-03 19:38:20 +00:00
Vadim Zeitlin
1fdc16adf7 added SetHoverBitmap() and implemented it under wxMSW; extended the docs 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-11-03 01:48:10 +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
ed7fdb8606 First part of '[ 1216148 ] cleanup: unused variables and declarations'. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-06-07 19:16:15 +00:00
Robin Dunn
31582e4e11 Patch #1203934: enable best size caching for MSW widgets 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-05-18 02:23:01 +00:00
Vadim Zeitlin
9266e0ecde undid last change to wxBitmapButton::GetBestSize(), in fact it doesn't make sense to support wxBU_EXACTFIT for it at all, so just removed the code doing it and mentioned it in the docs 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-10-28 22:43:14 +00:00
Vadim Zeitlin
97786ab70f fixed wxBU_EXACTFIT handling in wxBitmapButton (closes 1056234) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-10-28 16:47:39 +00:00
Vadim Zeitlin
a6fd0fde4c update the disabled buttons appearance when system colours change (followup to patch 1027243) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-10-03 13:46:11 +00:00
Vadim Zeitlin
d50dbf7c6a construct brush used for painting disabled bitmap buttons dynamically (heavily modified patch 1027243) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-09-18 12:34:45 +00:00
Włodzimierz Skiba
fcf90ee1b1 Source cleaning: whitespaces,-1/wxID_ANY,TRUE/true,FALSE/false. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-08-19 17:39:28 +00:00
Robin Dunn
9f88452895 * Implemented BestSize cache 
* Added calls to InvalidateBestSize where things affecting BestSize
  are modified.  There are probably several other places where this
  still needs to be done...

* Added wxWindowBase::GetBestFittingSize that will merge the BestSize
  into the MinSize, (if any) and return the result.

* SetBestFittingSize will now only set the MinSize to the value that
  was passed to it, without merging in the BestSize


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-06-24 20:09:45 +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
af498247c5 make XTI compile with VC6 (patch 896614) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-04-15 22:51:57 +00:00
Julian Smart
e8153940f9 Added wxBU_EXACTFIT support to wxBitmapButton on wxMSW 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-03-23 20:39:57 +00:00
Robin Dunn
c046274e38 implment wxBitmapButton::DoGetBestSize 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-03-16 21:58:53 +00:00
Dimitri Schoolwerth
a265d21aad Renamed PATPAINT to PATTERNPAINT (The former is an existing define in wingdi.h); Cosmetic code cleanup. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-01-24 21:16:59 +00:00
Vadim Zeitlin
2b2685355f just clarified an incorrect comment 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-01-23 22:06:37 +00:00