Commit Graph

283 Commits

Author SHA1 Message Date
Vadim Zeitlin
df13791078 Merge wxQT branch into the trunk.
This merges in the latest sources from GSoC 2014 wxQt project with just a few
minor corrections, mostly undoing wrong changes to common files in that branch
(results of a previous bad merge?) and getting rid of whitespace-only changes.
Also remove debug logging from wxGrid.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-24 01:50:11 +00:00
Paul Cornett
5b4a70247c use "new" wx-prefixed macros in samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-03-30 07:07:55 +00:00
Paul Cornett
8b4ae731d3 use wxOVERRIDE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-03-30 00:02:23 +00:00
Vadim Zeitlin
9b31387508 Merge the changes from 3.0 branch.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-11-12 18:06:37 +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
Paul Cornett
ea92bb677d use stock colour/pen/brush objects in samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-01 23:06:50 +00:00
Vadim Zeitlin
7a78a93782 Add wxControl::GetSizeFromTextSize() to size the control to its text.
This function can be used to size a, say, wxTextCtrl to be exactly of the size
needed to enter the given amount of text in it.

This patch adds wxGTK implementation for wxTextCtrl, wxChoice and wxCombobox;
changes to the samples and the documentation.

Closes #14812.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-11-09 21:11:37 +00:00
Vadim Zeitlin
e709239889 Use wxHAS_IMAGES_IN_RESOURCES instead of explicit platform checks.
Add a special symbol which is defined only if the icons and other images (e.g.
cursor) are in the separate resource files and don't need to be embedded as
XPMs in the main program.

This makes the checks more clear and more customizable as it's enough to
change wxHAS_IMAGES_IN_RESOURCES definition instead of changing many platform
checks.

Closes #14050.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 00:28:58 +00:00
Vadim Zeitlin
d159e96495 Improve layout in the samples to avoid problems under Mac.
Changes the samples to look better under Mac and avoid the worst problems such
as overlapping buttons or truncated controls.

Closes #11651.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-28 13:51:21 +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
Vadim Zeitlin
0a12e013f5 Deprecate second parameter of wxSlider::SetTickFreq().
This parameter was never needed nor properly documented. Simply remove it from
SetTickFreq() and keep the overload still taking it for backwards
compatibility only.

Closes #12907.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-05 16:36:30 +00:00
Vadim Zeitlin
d931703342 Inherit notebook background recursively under wxMSW.
With MSWSetTransparentBackground() hack only the panel which was the immediate
child of wxNotebook (i.e. its page) inherited the notebook background but not
its children. This resulted in jarring background discontinuities when nested
panels were used.

Fix this by inheriting notebook background in all child panels by testing for
the return value of the parents MSWHasInheritableBackground() method in
wxPanel::HasTransparentBackground() recursively.

Closes #12317.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-10 21:48:17 +00:00
Vadim Zeitlin
526954c596 Globally use "wxWindows licence" consistently.
Use "wxWindows licence" and not "wxWidgets licence" (the latter doesn't
exist) and consistently spell "licence" using British spelling.

See #12165.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-13 13:29:13 +00:00
Vadim Zeitlin
3cb332c155 Remove unnecessary mondrian.{ico,xpm} files from samples directory.
Standardize on using sample.rc and sample icon in all the samples, it was
confusing that some of them used it and other didn't, without any apparent
logic.

Remove the now unnecessary icon files, including the dialogs sample icon which
seemed to be corrupted (this closes #11146).

Also replace multiple OS/2 resource files with a single one in the sample
directory. The OS/2 projects/makefiles would need to be updated to use them.

Remove dialogs sample icon.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-06-20 17:42:33 +00:00
Vadim Zeitlin
d3eb13d2aa Fix focus debugging in the controls sample.
A wrong format string was used in Printf() resulting in useless output.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-21 12:51:14 +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
43b2d5e7c3 Put braces around all calls to wxLogFunctions() inside an if statement.
This suppresses all the remaining g++ -Wparentheses warnings and uses consistent style everywhere.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-20 16:47:54 +00:00
Vadim Zeitlin
3998c74b9b use wxRA_SPECIFY_COLS/ROWS instead of old, deprecated and confusing wxRA_HORIZONTAL/VERTICAL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-03 22:33:32 +00:00
Vadim Zeitlin
be8b43858c added (wxMSW-only) wxToolTip::SetMaxWidth() and improve its default behaviour (#2817)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-23 13:26:20 +00:00
Vadim Zeitlin
81d3348a9b replace wx_{const,static,reinterpret}_cast with their standard C++ equivalents
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-02 02:43:11 +00:00
Vadim Zeitlin
837b01e2f8 use wxIconizeEvent::IsIconized() instead of deprecated Iconized()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-27 21:07:42 +00:00
Paul Cornett
b8c57d7f0e don't include private header in a sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-20 16:57:51 +00:00
Robert Roebling
6695f8f826 Give spin button the same height as the associated text control
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-20 08:20:55 +00:00
Robert Roebling
0f252d1171 Update controls sample to follow documented logic
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-05-23 11:04:37 +00:00
Vadim Zeitlin
92c01615ec remove/replace redundant SetAutoLayout() and Fit() calls, leave just SetSizer[AndFit]() ones (patch 1905759)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-15 02:08:02 +00:00
Vadim Zeitlin
da603a6786 fix the code to not use dangling pointers resulting in asserts about invalid Unicode strings mentioned in the bug 1880411
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-26 22:20:45 +00:00
Chris Elliott
1583600031 fixes as per http://thread.gmane.org/gmane.comp.lib.wxwidgets.devel/92325
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-10 07:44:34 +00:00
Vadim Zeitlin
5cb837400e compilation fix (misplaced comma in OnIdle)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-19 22:13:21 +00:00
Vadim Zeitlin
2dd8d2d7f0 update status bar display when we don't have focus too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-25 13:43:30 +00:00
Vadim Zeitlin
47a8a4d5cc make IsEnabled() return false even if the window parent, and not the window itself, is disabled and added IsThisEnabled() implementing the old IsEnabled() behaviour; also significantly simplify the window state management code in all ports by factoring out the common parts in wxWindowBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-23 14:01:53 +00:00
Vadim Zeitlin
ddaa6e899b fix unused variable warning with wxUSE_TOOLTIPS==0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-02-07 17:04:02 +00:00
Vadim Zeitlin
69199aad02 rebaked with baefile rev 928
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-04 20:39:49 +00:00
Jamie Gadd
90d05e9b6e Don't set background of wxMemoryDC before selecting bitmap into it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-13 00:41:55 +00:00
Vadim Zeitlin
3126a4ee61 removed wxHyperlinkCtrl from this sample, it's not in the widgets one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-03 12:41:00 +00:00
Vadim Zeitlin
c4ef14c263 make the frame big enough to show all controls initially
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-03 12:39:27 +00:00
Vadim Zeitlin
45262a3415 avoid asserts by not using GetSelection() with multi selection listbox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-30 23:25:18 +00:00
Vadim Zeitlin
1a8b677e3b added wxHyperLink and context help testing code (not sure if either of them should actually be here...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-30 23:16:55 +00:00
Stefan Neis
7c2151fa69 Avoid problems with events that might be sent during creation of controls.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-18 11:45:30 +00:00
Julian Smart
25e19bdf01 Check for null pointers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-23 20:32:00 +00:00
Julian Smart
00dff4d222 Combobox may not be fully created at this point
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-17 08:59:36 +00:00
Vadim Zeitlin
c670c85582 added Get/SetItemToolTip() (and implemented them for MSW) to allow setting tooltips for the individual radiobox items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-04 16:08:56 +00:00
Włodzimierz Skiba
33cf9a1922 Warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-28 17:07:14 +00:00
Włodzimierz Skiba
8e13c1ec4e Make wxPASSWORD and wxPROCESS_ENTER really deprecated.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-28 11:02:37 +00:00
Vadim Zeitlin
7891b4d450 don't send weird colours for different controls, this looks really bad under some platforms (such as Mac) and makes the text unreadable under the others; there is widgets sample now for testing whether the colour setting works interactively
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 20:58:21 +00:00
Vadim Zeitlin
361484a8db create a non readonly combobox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 20:55:12 +00:00
Vadim Zeitlin
bc50a2ae95 log wxChoice events in the same format as wxComboBox ones to make it simpler to compare them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 19:16:35 +00:00
Vadim Zeitlin
9ae1959972 use the sizer to layout the main window/panel (this allows to give more size to the log window by resizing the main frame while before it was pretty difficult to see anything in it)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 17:04:23 +00:00
Robert Roebling
cc7e9e2083 Added test for wxComboBox::SetString
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-20 17:12:07 +00:00
Włodzimierz Skiba
9d8b1d2f3e Somebody forgot to restore from testing phase.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 11:09:19 +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