Commit Graph

61303 Commits

Author SHA1 Message Date
Vadim Zeitlin
aa9e7d3326 Don't make wxDataViewCtrl::ExpandAncestors() virtual
This method has a common implementation and is not supposed to be overridden.
2016-03-22 21:14:10 +01:00
Vadim Zeitlin
d324bd2469 Don't crash if overridden wxDataViewModel::GetValue() throws
Don't let any exceptions propagate to GTK+ code as this results in an
immediate crash there, at least with GTK+ 3.14.5.
2016-03-22 19:32:06 +01:00
Vadim Zeitlin
1bbc44daff Support background colour in wxDataViewItemAttr in wxGTK
The code handling background colour was commented out for some reason, simply
enable it as it seems to be working just fine -- and update the sample to show
that it does.
2016-03-22 17:49:49 +01:00
Vadim Zeitlin
a20183440b Set item being edited earlier in wxDataViewRenderer
Partially undo the changes of e417913f46 and set
m_item in StartEditing() as it's supposed to be already set when
CreateEditorCtrl() is called and setting it in NotifyEditingStarted() was too
late for this.
2016-03-19 00:45:15 +01:00
Vadim Zeitlin
6316045e19 Remove unnecessary wxOSX_USE_COCOA checks in wx/osx/dvrenderers.h
These checks are not needed any more now that Carbon is not supported any
loner.
2016-03-19 00:17:14 +01:00
wanup
c4e892629f Implement wxDataViewChoiceByIndexRenderer for wxOSX
Add missing class implementation.

Closes #17452.
2016-03-19 00:17:13 +01:00
Vadim Zeitlin
9829446755 Refactor wxDataViewEvent constructors
Take care of all the common stuff such as setting the event object and the
model, which is used for all events, in the ctor. Also set both the column
pointer and the column index at once instead of having two separate setters
for them which could result in inconsistent event objects (and did, as
sometimes only one or only the other field was set).

This makes the code shorter (we save 160 lines) and more clear and ensures
that everything is always initialized.

Closes #12649.
2016-03-19 00:16:51 +01:00
Vadim Zeitlin
e2e7d3d391 Fix wxELLIPSIZE_END with wxALIGN_RIGHT in wxMSW wxDataViewCtrl
Using wxELLIPSIZE_END together with wxALIGN_RIGHT resulted in unnecessarily
ellipsizing or truncating the column contents in generic wxDataViewCtrl under
MSW due to the combination of b642747fd2 and
the native API behaviour.

Fix this by not using alignment in RenderText(): it is unnecessary anyhow and
not doing it avoids the problem as a side effect.

Closes #17363.
2016-03-18 22:33:31 +01:00
Vadim Zeitlin
db6e1c5b38 Make wxCOL_WIDTH_AUTOSIZE work dynamically in generic wxDataViewCtrl
Caching the best column widths broke autosizing behaviour if the column title
was updated after setting the width to wxCOL_WIDTH_AUTOSIZE.

Fix this by invaliding the column cached width if its text changes.
2016-03-17 22:34:14 +01:00
Vadim Zeitlin
a9be974d5b Avoid unnecessarily refreshing last column in generic wxDataViewCtrl
UpdateColumnSizes() was called whenever the control was modified in any way
since 4156e1a5c9 and it refreshed the entire
last column even if absolutely nothing changed.

Don't do this unless the last column width has really changed.
2016-03-14 00:13:46 +01:00
Vadim Zeitlin
d613fb75f6 Don't update if column width didn't change in generic wxDataViewCtrl
Avoid calling UpdateDisplay() unnecessarily if the column width didn't really
change. This doesn't result in anything really bad happening right now, but it
could easily result in an infinite stream of updates if the code were only
slightly different and it just seems useless to do it.
2016-03-14 00:13:46 +01:00
Vadim Zeitlin
34b0e534f8 Make wxDataViewCtrl::IsMultiColumnSortAllowed() exist in all ports
Contrary to the documentation, this method only existed in the generic
control, add it to the base class now so that the code using it could compile
when using the native ports too.
2016-03-14 00:13:46 +01:00
Vadim Zeitlin
062444ee50 Make generic wxDataViewCtrl EnsureVisible() overload non-virtual
There doesn't seem to be any reason for this method to be virtual other than
preventing "virtual function hiding" warnings from gcc, so just rename it to
have a different name than the virtual EnsureVisible() inherited from the base
class instead.
2016-03-14 00:13:46 +01:00
Vadim Zeitlin
b70109ee7a Don't make some generic wxDataViewCtrl unnecessarily virtual
These methods are not supposed to be overridden and don't override any base
class methods neither.
2016-03-14 00:13:46 +01:00
Vadim Zeitlin
a3fa628669 No changes, just add wxOVERRIDE to wx/generic/dataview.h
Mark the overridden virtual functions as being overridden.

Also reformat some methods to put them on several lines to prevent the lines
from becoming way too long.
2016-03-14 00:13:46 +01:00
Vadim Zeitlin
e7c8349d9b Avoid MSVC 14 warning about variable hiding in dataview sample
The warning is harmless but it was indeed confusing to call "parent" both a
local variable and a function parameter, so don't do it.
2016-03-14 00:13:46 +01:00
Vadim Zeitlin
c7a3785a5c Avoid mixing code and declarations in C expat code
Some compilers, notably MSVC, don't support C99 and C89 doesn't allow this.

Fixes MSVS compilation after 7e22fb4f64.
2016-03-14 00:12:07 +01:00
Václav Slavík
7e22fb4f64 Update the version of Expat used to 2.1.1 2016-03-13 17:12:54 +01:00
Vadim Zeitlin
c03ae2a8f8 Propagate changes to generated wx/msw/setup0.h back to setup_inc.h
Changes of d053a90486 only updated the generated
wx/msw/setup0.h file but not the file wx/msw/setup_inc.h from which it is
generated and so would have been lost after the next modification to the
latter.

Modify the latter one too to ensure that the changes stick.

See https://github.com/wxWidgets/wxWidgets/pull/238
2016-03-13 15:37:08 +01:00
Vadim Zeitlin
81570ae070 Deprecate wxGRIDTABLE_REQUEST_VIEW_{GET,SEND}_VALUES
These grid table requests seem to have been never used and were not doing much
in wxGrid neither, moreover they were never documented, so just stop
supporting them.
2016-03-12 19:01:44 +01:00
Vadim Zeitlin
fcd5284aed Document wxGridTableMessage and wxGridStringTable
Add at least minimal documentation for these classes.

Closes #4181.
2016-03-12 18:53:07 +01:00
Kinaou Hervé
2020ac3db3 Document more wxAuiManager public methods
Add documentation for the following functions:

 - CalculateHintRect
 - CanDockPanel
 - ClosePane
 - CreateFloatingFrame
 - DrawHintRect
 - MaximizePane
 - OnRender
 - OnPaneButton
 - RestorePane
 - RestoreMaximizedPane
 - StartPaneDrag

Closes #15018.
2016-03-12 18:39:58 +01:00
Vadim Zeitlin
ef6d42e865 Merge branch 'xrc-aui'
Add XRC handlers for wxAuiManager and wxAuiPaneInfo.

Closes #13520.
2016-03-12 18:21:24 +01:00
Matthew Heinsen Egan
037f697760 Report libraries in EXTRALIBS_WEBVIEW in wx-config output
These libraries should be included when "webview" appears in --libs or
--optional-libs.

Closes https://github.com/wxWidgets/wxWidgets/pull/251
2016-03-12 01:46:54 +01:00
Kolya Kosenko
da195023c1 Fix wxGTK/MSW build in wxDIB.
Don't define wxMSW-specific wxDIB::CreatePalette() method when not building
wxMSW.

Closes #17248.
2016-03-09 15:42:51 +01:00
Vadim Zeitlin
379024d94a Add wxAuiManager and wxAuiPaneInfo to the XRC schema
See #13520.
2016-03-09 01:11:21 +01:00
Andrea Zanellato
cf5fa7d5f1 Add support for wxAuiManager and wxAuiPaneInfo to XRC
Add XRC handler for wxAuiManager and include the existing wxAuiNotebook
handler into it (but notice that wxAuiToolBar handler added by a later #15686
in f269f868d7 remains separate).

Also update the AUI dialog in the sample and stop hardcoding its size in
pixels.

See #13520.
2016-03-09 01:11:16 +01:00
Vadim Zeitlin
6f80021950 Fix wxGTK wxHyperlinkCtrl compilation problem with g++ 5.2
Make wxHyperlinkCtrl ctors non-inline to work around an error about incomplete
wxHyperlinkCtrlColData in the inline ctor body with this compiler (but not
with g++ 4.9 nor 5.3, somehow).

Closes #17089.
2016-03-07 19:41:58 +01:00
Vadim Zeitlin
6ac52b3bab Merge setting link colours for wxGTK3 wxHyperlinkCtrl
Closes https://github.com/wxWidgets/wxWidgets/pull/249
2016-03-07 16:17:11 +01:00
Vadim Zeitlin
c32fad09b8 Don't use __has_include() to test for C++11 headers
This is unnecessary as we know that we have them in C++11 mode and we can't
compile them in non-C++11 mode even if they exist.

Not doing it simplifies the code and works around a bug in clang 3.2.

Closes https://github.com/wxWidgets/wxWidgets/pull/247
2016-03-07 16:16:45 +01:00
Hans Mackowiak
d30673e507 Implement setting link colours in wxHyperlinkCtrl for GTK+3
Use GtkCssProvider to customize the colours used.

Closes #17089.
2016-03-07 15:00:07 +01:00
Hans Mackowiak
1e70c05759 Add wxWindow::ApplyCssStyle() helper to wxGTK
This is useful for styling GTK+ 3 widgets.

See #17089.
2016-03-07 13:22:57 +01:00
Vadim Zeitlin
b0445661b1 Avoid harmless MSVC warning about implicit bool conversion
With WXWIN_COMPATIBILITY_3_0 set to 1, m_anyModified member of
wxPropertyGridPageState is an unsigned char, not bool, so don't convert it to
a bool implicitly.
2016-03-07 02:15:58 +01:00
Vadim Zeitlin
08f060ebd2 Fix harmless unused variable warning in the help sample
wxHtmlModalHelp class can be used as a function, there is no need to name the
variable.
2016-03-06 22:12:30 +01:00
Vadim Zeitlin
b4d6348c6b Don't use a dummy menu with wxHtmlHelpFrame under OS X
Contrary to the comment in wxHtmlHelpFrame::Create(), this doesn't seem to be
necessary and can be actually problematic.

Never adding this menu obviates the need for the wxHF_MENU style from #15538.

Closes #15538.
2016-03-06 22:12:29 +01:00
Vadim Zeitlin
8336a77fe6 Revert all recent changes to wxHtmlWinParser::OpenURL()
The changes of 7e8c2cc4a5 broke opening URLs
of the form "file:///full/path/file.zip#zip:file.htm#anchor" as the one used
as the initial page in the help sample, which showed the error about not being
able to open it because OpenURL() now turned such URL into a partially escaped
one by replacing the last "#" with "%23" and preventing wxArchiveFSHandler
from handling it properly.

There seem to be too many problems with changing this code, so revert the
commit above and the commit 5c72e0c354 which
already corrected another problem with it.

See #17148.
2016-03-06 21:54:53 +01:00
Artur Wieczorek
31ab9d8f3f Make pointer to wxWindow a const argument.
State of referenced window is not going to be changed and let caller know about it.
2016-03-06 21:26:14 +01:00
Artur Wieczorek
ff788f05bb Move duplicated code to the shared function.
Code to calculate label width in wxPropertyCategory::GetTextExtent and CalculateTextExtent is duplicated.
2016-03-06 21:21:19 +01:00
Artur Wieczorek
8b44873690 Use Boolean value directly instead of executing conditional statement. 2016-03-06 21:20:11 +01:00
Artur Wieczorek
912eb6fef9 Use enum instead of macros to represent wxPropertyGrid internal flags. 2016-03-06 21:19:07 +01:00
Vadim Zeitlin
8e05886313 Allow MFC have idle events too in the MFC sample
Call MFC base class method from our overridden one.

Closes #15252.
2016-03-06 19:38:05 +01:00
Vadim Zeitlin
ac12896939 Update GTK+ autoconf macros and regenerate configure
Use the macro versions from 2.24.29 and 3.18.8 (latest available in Debian for
GTK+ 2 and 3 respectively) to fix the detection of pkg-config which was
incorrect in the old gtk-2.0.m4.

Closes #17027.
2016-03-06 18:36:16 +01:00
Vadim Zeitlin
f47d767fdb Merge branch 'scintilla-3.6.3'
Update bundled Scintilla to version 3.6.3.

Closes #17357.
2016-03-05 18:01:01 +01:00
Vadim Zeitlin
b7227f2bf3 Add files new in Scintilla 3.6.3 to bakefile and rebake
Also update MSVS 201x project file manually to match.
2016-03-05 17:59:37 +01:00
Vadim Zeitlin
f4fd4b8bde Merge with master to get bakefile changes 2016-03-05 17:46:36 +01:00
Vadim Zeitlin
a4efddba66 Restore fix to wchar_t comparison lost during 3.6.3 merge
This is required to avoid gcc warnings (and possibly errors with other
compilers) about ambiguous comparison operators due to our (wchar_t,
wxUniChar) overloads defined in wx/unichar.h.
2016-03-05 15:52:43 +01:00
Vadim Zeitlin
fa18eac81e Don't use wxOVERRIDE for method definitions in gen_iface.py
"override" keyword is only valid in declarations.
2016-03-05 15:51:50 +01:00
Vadim Zeitlin
a3d6eb7ebb Don't update version in MSVS 200x projects from inc_release script
This is now done by bakefile (again).
2016-03-05 15:47:38 +01:00
Vadim Zeitlin
72e68c9d9d Update MSVS 200x projects after 3.1.1 version change
Rebake them using bakefile to really take the version change into account.
2016-03-05 15:46:15 +01:00
Vadim Zeitlin
8fbf2bdc78 Revert "Manage VC[789] project files with upmake too"
This reverts commit ebd33579fd because upmake is
not enough for the version updates, we still need to use bakefile for this.
2016-03-05 15:34:45 +01:00