Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,529 Commits 1 Branch 330 Tags
a37da0fa555e3399a36e0c7cbc4ea96a4bf4d4f0
Commit Graph

54 Commits

Author SHA1 Message Date
Francesco Montorsi
a37da0fa55 Fix function wxControlBase::DoEllipsizeSingleLine to really make sure that the ellipsized string takes less pixels than maxFinalWidthPx. 
Add comments to explain in more details what the function does and in particular the valid ranges of all internal variables; fix in that regard both the code of both wxELLIPSIZE_START, wxELLIPSIZE_MIDDLE and wxELLIPSIZE_END.
Add more asserts to check the valid ranges and turn a couple of time-expensive checks in level-2 asserts.
Add a test unit for the wxControl::Ellipsize function.
Fix minor details in the docs of wxControl::Ellipsize.
Closes #11567.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-03-10 13:57:47 +00:00
Francesco Montorsi
8ab11e46c0 no real changes, just rename the variables to make the code more readable and to prepare everything for the next commit: 
- add postfix "Px" to all variables containing numbers of pixels
- add postfix "ToRemove" to initialChar and nChars vars to make it clear what they are for

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-03-10 11:07:57 +00:00
Vadim Zeitlin
c937bcac0f Add ellipsization support to wxDataViewCtrl. 
Implemented ellipsization in the generic, GTK and both OS X Carbon and Cocoa
versions but it currently doesn't work well in GTK as it changes the item
alignment unconditionally, this will need to be fixed later.

The behaviour for the columns is currently inconsistent between ports too:
under MSW they (natively) use wxELLIPSIZE_END, under GTK -- wxELLIPSIZE_NONE
and under OS X the same ellipsization mode as the column contents, i.e.
wxELLIPSIZE_MIDDLE by default.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-10-16 21:35:26 +00:00
Vadim Zeitlin
355ce7adea Rename wxEllipsizeFlags elements to avoid confusion with wxEllipsizeMode. 
We shouldn't use the same "wxELLIPSIZE_" prefix for two different enums, so
use wxELLIPSIZE_FLAGS one for wxEllipsizeFlags (they should be used less often
than wxEllipsizeMode so it's better to keep the short prefix for the latter).

Also add wxELLIPSIZE_FLAGS_NONE flag.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-10-16 21:32:51 +00:00
Vadim Zeitlin
0534259ab8 Move wxControl::GetCompositeControlsDefaultAttributes() from MSW to common. 
This function is not MSW-specific and should be used in generic implementation
of controls such as wxListCtrl, wxTreeCtrl and wxDataViewCtrl. Even if it is
needed by MSW only now, move it to the common code to avoid #ifdefs in these
controls code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-09-26 16:43:06 +00:00
Vadim Zeitlin
9a83f86094 Globally replace _T() with wxT(). 
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-07-23 20:30:22 +00:00
Vadim Zeitlin
8d6e8e45fe fix MSVC warnings about possibly uninitialized variables; some reindentation 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-02-09 13:16:42 +00:00
Francesco Montorsi
91d55088c9 revert insert=>append change; only for wxELLIPSIZE_END append() is valid 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-02-08 19:14:56 +00:00
Francesco Montorsi
a78618b062 split wxControl::Ellipsize() in two functions for better readability of the code; add support for ellipsization flags which allow to disable special processing of TAB/mnemonics characters 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-02-08 12:56:14 +00:00
Vadim Zeitlin
5b8b2c84f7 added SetLabelText() and EscapeMnemonics() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-12-31 14:14:07 +00:00
Francesco Montorsi
02b4f9fd2a PCH-less build fix 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-12-29 10:41:39 +00:00
Francesco Montorsi
7d27b6263c use correct wxELLIPSIZE_* constants after r57625 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-12-29 00:37:50 +00:00
Francesco Montorsi
5c87527c5a move Ellipsize() to wxControl so it can be easily used by other controls 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-12-28 21:16:00 +00:00
Vadim Zeitlin
916eabe60e add wxGenericStaticText (#9656) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-10-12 13:04:00 +00:00
Julian Smart
dc797d8e1b More border rationalisation. GetDefaultBorder is now mostly defined in base class files. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-11-13 12:10:34 +00:00
Vadim Zeitlin
f36e602b3f make various control names constants of type char, not wxChar, as this is more compatible with the old ANSI build and it doesn't make much sense to use wchar_t for ASCII strings anyhow 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-11-12 21:37:46 +00:00
Vadim Zeitlin
39bc0347fd added support for ellipsization and markup in wxStaticText (modified patch 1629946) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-04-01 14:13:15 +00:00
Vadim Zeitlin
74639764d0 added possibility to strip only mnemonics, not accels, in wxStripMenuCodes(); added wxControl::GetLabelText() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-07-25 18:40:04 +00:00
Włodzimierz Skiba
0bca037363 Include wx/bitmap.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-06-14 10:02:19 +00:00
Włodzimierz Skiba
e267406e11 Include wx/statbmp.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-31 09:34:05 +00:00
Robin Dunn
4a2e5ee8f9 Fixes for the DLL build 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-26 19:02:57 +00:00
Paul Cornett
e7445ff8ee move some data definitions to more appropriate places 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-26 16:12:31 +00:00
Włodzimierz Skiba
93fbbe0765 Include wx/control.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-26 10:15:44 +00:00
Włodzimierz Skiba
0e2d298670 !WX_PRECOMP (wxPalm) build fix. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-02-12 17:51:44 +00:00
Vadim Zeitlin
a3a4105df6 it is not possible to show/hide the window from the UpdateUI event handler; refactored the code by moving control-specific parts into the derived classes (patch 1338350) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-02-12 16:32:50 +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
c9d59ee7e0 Source cleaning: TRUE/true, FALSE/false, whitespaces, tabs. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-09-09 17:42:36 +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
Robin Dunn
c0e6c05138 reverted m_adjustMinSize change prepatory for a new approach to fix 
the problem


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-06-21 22:58:13 +00:00
Robin Dunn
fe161a2685 Controls will readjust their size and minsize when SetLabel or SetFont 
are called.  Fixed up wxStaticText to blend the wxST_NO_AUTOSIZE with
this new functionality.  Made SetBestSize public under the
SetBestFittingSize name.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-06-19 01:35:10 +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
Robin Dunn
b3fcfa4d89 wxStaticBitmapBase::DoGetBestSize 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-04-07 21:47:04 +00:00
Vadim Zeitlin
51ce89f1bf removed (well, kept empty shell to avoid breaking existing code) InheritAttributes() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-04-01 14:54:07 +00:00
Vadim Zeitlin
42497f30eb don't inherit font from the parent by default 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-03-30 23:16:45 +00:00
Julian Smart
6463b9f539 Reverted patch [ 832096 ] Final separation for GUI and console for Open Watcom 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-01-15 13:49:22 +00:00
Julian Smart
1169a91932 Applied patch [ 832096 ] Final separation for GUI and console for Open Watcom 
(Watcom compiler doesn't like ctor implementation in headers)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-01-11 15:33:01 +00:00
Vadim Zeitlin
230205aec5 use ShouldInheritColours() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-10-16 09:38:04 +00:00
Vadim Zeitlin
ac8d0c118b added wxVALIDATOR_PARAM and use it to avoid warnings about unused validators when wxUSE_VALIDATORS==0 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-09-15 19:54:51 +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
Julian Smart
55d99c7a77 Fixed copyrights and licence spelling 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-03-17 11:28:33 +00:00
David Webster
344e7ee2c5 Font fix for OS/2 common control creation 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-08-05 03:13:59 +00:00
Vadim Zeitlin
92b0a2a13c don't inherit the controls colours from the parent - at least for the background colour this is not the right thing to do 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-02-20 00:21:26 +00:00
Gilles Depeyrot
799ea01170 implement out-of-line destructors where needed instead of using __DARWIN__ 
specific conditional compilation


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13447 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2002-01-07 21:52:28 +00:00
Vadim Zeitlin
1e6feb95a7 first pass of wxUniv merge - nothing works, most parts don't even compile 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-06-26 20:59:19 +00:00
Vadim Zeitlin
bfbd6dc192 1. cursor fixes: frame does have hand cursor in the controls sample now, 
modal dialogs don't have busy cursor even if wxIsBusy()
2. wxTextCtrl sets client data field in the generated events
3. added wxEnhMetaFile::SetClipboard()


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-02-25 23:49:41 +00:00
Vadim Zeitlin
674ac8b919 1. more warnings fixes in gtk/region.cpp and common/tbarsmpl.cpp 
2. wxWindow::Create() always takes a wxValidator parameter, even if
   !wxUSE_VALIDATORS - it is just ignored then, tons of #if wxUSE_VALIDATORS
   removed


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2000-01-06 16:47:48 +00:00
David Webster
f38374d0d7 Removal of previous wxValidtor code for wxOS2 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-11-19 22:36:55 +00:00
David Webster
5d4b632ba3 OS/2 PM Fixeups for fonts, validators, and html 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-11-08 05:20:31 +00:00
Robert Roebling
1b68e0b5b9 Refresh() problem from DialogEd solved 
Unified the naming of GNU pragmas for base classed:
    dialogbase, choicebase, etc.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-10-12 21:52:17 +00:00