Commit Graph

53771 Commits

Author SHA1 Message Date
Vadim Zeitlin
4cbe0dd816 Fix test for wxUSE_TREELISTCTRL in configure.
wxUSE_TREECTRL was wrongly used instead.

Closes #13470.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-18 20:26:38 +00:00
Robin Dunn
ba4f890e49 FIx broken or missing interface items for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-18 04:38:01 +00:00
Vadim Zeitlin
5c79993559 Fix format specifiers used for "unsigned long" in wxPG code.
"unsigned long" quantities must be formatted using "%l[xou]" and not just
"%[xou]" as the latter doesn't work correctly on 64 bit platforms.

Closes #13447.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-17 11:06:15 +00:00
Vadim Zeitlin
32a925f832 Change wxDIALOG_NO_PARENT to avoid clash with wxICON_EXCLAMATION.
Use 0x20 (wxAPPLY) instead of 0x100 (wxICON_EXCLAMATION) for
wxDIALOG_NO_PARENT as otherwise using wxICON_EXCLAMATION with wxMessageBox in
wxGTK (and possibly other ports, although not wxMSW which doesn't honour
wxDIALOG_NO_PARENT for message boxes at all) resulted in not using the
specified parent for the message box and, as a side effect, not centering it
on its parent neither.

Closes #13464.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-17 11:06:11 +00:00
Vadim Zeitlin
f8ec7b81b2 Add wxUSE_TREELISTCTRL checks to treelist.cpp itself.
The contents of this file was still compiled even when wxUSE_TREELISTCTRL was
turned off. Fix this by adding the missing "#if wxUSE_TREELISTCTRL" check
around it.

Closes #13470.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-17 11:06:05 +00:00
Vadim Zeitlin
6ab3e0396c Fix the library of wxGenericDirCtrl in the documentation.
Closes #13482.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-17 11:06:01 +00:00
Vadim Zeitlin
88cc66f72d Only define wxUSE_WEBVIEW if wxWebView is really available.
Don't define wxUSE_WEBVIEW in configure if WebKit is not available under Unix
(we should also check for wxUSE_WEBVIEW_IE under Windows later) and add the
check that either wxUSE_WEBVIEW_WEBKIT or wxUSE_WEBVIEW_IE is defined if
wxUSE_WEBVIEW is to wx/chkconf.h.

This makes it possible to just check for wxUSE_WEBVIEW instead of checking for
wxUSE_WEBVIEW && (wxUSE_WEBVIEW_IE || wxUSE_WEBVIEW_WEBKIT) as the code did
previously which was ugly and error-prone.

Also, define wxUSE_WEBVIEW_IE in configure under MSW. Currently this supposes
that the required IE headers/libraries are available which is probably wrong,
we should add checks for them later.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-16 22:44:17 +00:00
Vadim Zeitlin
32cc8d13b8 Check for wxUSE_WEBVIEW being defined.
All wxUSE_XXX options must be always defined as we test for them with #if and
not #ifdef, so check for this one too for consistency.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-16 22:44:11 +00:00
Vadim Zeitlin
792339b963 Fix wxFont::GetFaceName() for not realized yet fonts in wxMSW.
GetFaceName() could be called for a font that hadn't been really used yet and
hence its wxFontRefData::m_hFont could be 0 and couldn't be used in
GetMSWFaceName().

Fix this by using GetHFONT() accessor instead of m_hFont directly to create
the font if necessary.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-16 22:44:04 +00:00
Robin Dunn
e932127792 fixes for missing or broken interface items for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-16 17:03:01 +00:00
Vadim Zeitlin
e23e368bc4 Fix int field of wxCommandEvents generated by menu items in wxMSW.
Set the int field of wxCommandEvent generated by clicking on the menu items
correctly for not checkable items: it is supposed to be -1 and not 0 (which is
the value for checkable but currently unchecked items). This was already the
case for wxGTK and wxOSX and implied by the comments in the code.

Make wxMSW behave like this too and clearly document this behaviour.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-16 13:23:14 +00:00
Vadim Zeitlin
99893e284f Fix int field of wxCommandEvent generated by popup menu items in wxMSW.
The intention of the code generating the event for popup menu items was to
pass false (0) or true (1) in the int field of wxCommandEvent to indicate
whether the item was checked or not but, because wxMenu::SendEvent() takes int
as second argument and not book, we passed either 0 or MF_CHECKED (== 8).

Fix this by correctly passing a boolean for checkable items.

See #11644.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-16 13:23:10 +00:00
Vadim Zeitlin
3f8502f7fc Fix checked state for the popup menu items in the events generated by them.
We incorrectly passed the sign-extended int id to ::GetMenuState() function
that expects an unsigned WORD id, so it never found the item if the WORD id
had the high bit set. Fix this by correctly passing the unsigned id to it.

Closes #11644.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-16 13:23:05 +00:00
Stefan Csomor
7aab7c77f4 reverting change, for precompiled headers, unfortunately this means that WXROOT must not contain spaces unless properly escaped
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-15 19:05:06 +00:00
Jouk Jansen
d2758163a9 Repair compile sequenze for wxGTK on OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-15 14:25:50 +00:00
Steve Lamerton
882ecaa631 Use integral value for OLECMDID_OPTICAL_ZOOM as we cannot tell if an enum value is already defined or not.
Fixes #13475

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-14 16:45:50 +00:00
Steve Lamerton
8240dea400 Update configure to only define wxUSE_WEBVIEW_WEBKIT if all the required components are available.
Fixes #13474

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-14 14:03:34 +00:00
Steve Lamerton
4794f127cd Cause a compile time error in the wxWebView sample if no backend exists.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-14 12:39:30 +00:00
Steve Lamerton
c78da4eb62 Make wxBookCtrlBase::GetSelection virtual, as per the documentation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-14 08:24:06 +00:00
Steve Lamerton
30e2c04682 Only build the wxWebView tests if there is an available backend.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-14 07:39:28 +00:00
Steve Lamerton
d04f535c7e Correctly disable webkit backend if the appropriate headers cannot be found.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-13 21:26:41 +00:00
Steve Lamerton
6edb39127b Correct a typo in the wxWebView tests.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-13 19:39:38 +00:00
Steve Lamerton
af5fccc140 Disable webkit backend if the appropriate headers cannot be found.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-13 12:06:06 +00:00
Steve Lamerton
9d2f31db0c Update wxWebView guards to stop backend compilation when wxUSE_WEBVIEW is 0.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-12 18:35:39 +00:00
Steve Lamerton
96ceb55625 Ensure that we have an available backend for wxWebView compilation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-12 13:42:30 +00:00
Jouk Jansen
b175dd2c5b Update setup for OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-12 11:13:05 +00:00
Jouk Jansen
821c2a3750 add compile support for thread sample on OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-12 10:57:44 +00:00
Václav Slavík
5c65a66151 Fix appending of non-leaf node to wxGTK's wxDataViewCtrl.
This was accidentally broken in r68965: appending a branch node after
all others node resulted in corruption of m_nodes, as the node was never
added to the list.

Fixes #13467.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-12 09:23:59 +00:00
Stefan Csomor
b5f035b37a supporting spaces
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-12 07:12:27 +00:00
Vadim Zeitlin
df0419d21d Fix best size computation for wxTextCtrl without borders in wxMSW.
wxTextCtrl with wxBORDER_NONE (and possibly wxTE_READONLY) style is often used
instead of a wxStaticText to allow copying the text, so make the size of such
control the same as size of the label. This ensures that it aligns correctly
with the label vertically while before the baselines were not aligned because
a border-less text control was rendered by MSW as a label but had a too big
size.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-11 21:55:47 +00:00
Steve Lamerton
7011055c55 Ensure that we have an available backend for wxWebView compilation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-11 13:26:24 +00:00
Vadim Zeitlin
e657c460a3 Still resize wxSplitterWindow children even when sash position doesn't change.
Since the changes if r68876, the splitter windows were not resized correctly
if the splitter size in the direction orthogonal to its own didn't change.
This was an unintended side effect of the changes in that commit as it only
wanted to avoid calling SetSashPositionAndNotify() in this case, but
SizeWindows() should still be called.

Ensure that we do call it always from wxSplitterWindow::OnSize() to fix this.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-11 11:27:17 +00:00
Vadim Zeitlin
b550ad2aec Regenerate configure after webview branch merge.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-11 10:55:03 +00:00
Steve Lamerton
d60b34a413 Update setup files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-11 10:15:28 +00:00
Steve Lamerton
92b4653a62 Rebake trunk after wxWebView merge and add missing project files for the wxWebView library.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-11 10:12:19 +00:00
Robin Dunn
86381d4297 Fix missing and broken interface items for Phoenix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-11 00:35:32 +00:00
Steve Lamerton
b2b31b87fb Merge the new wxWebView classes from the SOC2011_WEBVIEW branch.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-10 18:09:12 +00:00
Paul Cornett
1ddb3b55b0 update WarpPointer for GTK3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-10 16:02:59 +00:00
Steve Lamerton
1d156af324 Merge in from trunk r68684 - r69046
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@69047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-10 15:09:22 +00:00
Robin Dunn
01bd848eb9 Enable the HWND of the task dialog to be fetched with GetHandle if it is being used.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-10 03:26:37 +00:00
Vadim Zeitlin
1a66177951 Allow setting colours and font of wxTreeListCtrl.
Use wxCompositeWindow<> to propagate changes of colours and font to
wxDataViewCtrl that wxTreeListCtrl uses internally.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-08 21:15:24 +00:00
Paul Cornett
f06efcfd66 non-pch build fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-07 16:57:42 +00:00
Paul Cornett
29e461a210 remove unnecessary GTK declarations from defs.h, move things only used once to the place that needs them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-07 16:56:50 +00:00
Paul Cornett
fb6e5bff0e move addition of -lX11 to better place
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-06 16:35:53 +00:00
Paul Cornett
527479c46e don't disable cast checks in debug builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-06 16:24:49 +00:00
Paul Cornett
b454750571 remove unused __WXGTK12__ symbol
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-06 16:09:51 +00:00
Paul Cornett
89761a49d1 remove (very) obsolete GTK version check
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-06 15:54:12 +00:00
Robin Dunn
ea76345f0f fix for non-pch builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-06 04:17:44 +00:00
Robin Dunn
4f8870e337 Avoid infinite recursion on Mac in comboctrl, and fix an uninitialized pointer in propgrid
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-05 20:08:04 +00:00
Václav Slavík
76b92fa5c7 Fix crash in wxDataViewCtrl::UpdateColWidths().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-09-05 15:40:56 +00:00