Commit Graph

54258 Commits

Author SHA1 Message Date
Julian Smart
5dec941a5b Applied #13763 from dghart, to use primary selections if available
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-15 11:32:58 +00:00
Vadim Zeitlin
9edd688dd3 Ensure that wxPropertyGrid::m_tlp is initialized early enough.
This member variable could be used before it was initialized as
OnTLPChanging() was called from Create() before Init2(), where m_tlp was
assigned NULL, was called.

Closes #13552.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-15 00:22:48 +00:00
Vadim Zeitlin
81dd48085d No changes, just harmonized the EOLs in the ISS file.
Use consistent DOS EOLs for all the lines in this file.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-14 18:42:11 +00:00
Václav Slavík
c9d3d00cdf Remove unnecessary m_editorCtrl assignment.
m_editorCtrl is WeakRef<>, so doing it is pointless, and it breaks VC6
compilation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-14 17:38:19 +00:00
Václav Slavík
a85b4023d1 Close wxDataViewCtrl inline editor when destroying the control.
If the wxDataViewCtrl control was destroyed while an inline editor
control was still active, it wouldn't get destroyed in the right order
and the ~wxWindow assert about unpopped event handlers would be
triggered.

Fix this by popping the handler as one of the first things in
wxDataViewRendererBase destructor.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-14 16:00:30 +00:00
Václav Slavík
eff1c3e8ec Don't change horizontal scroll position needlessly in wxDataViewCtrl.
When ScrollTo() or EnsureVisible() was called in the generic
wxDataViewCtrl implementation with unspecified column, horizontal scroll
position was reset to left-most position, which doesn't make much sense.
Instead, leave horizontal position unchanged in this case and only
change it when explicitly requested.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-14 15:53:28 +00:00
Václav Slavík
78e18e8d53 Ensure that current column is visible in generic wxDataViewCtrl.
When navigating between columns using keyboard, ensure visibility of the
newly selected column.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-14 15:53:25 +00:00
Chris Elliott
ecd4526b30 2.9.3 version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-14 08:52:48 +00:00
Vadim Zeitlin
afe9b0559a Add the release date of 2.9.3 to the change log.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-14 00:46:12 +00:00
Vadim Zeitlin
fc672a2aba Use string column identifiers with NSTableColumns in wxDataViewCtrl.
Starting with OS X 10.7 the column identifiers used in NSOutlineView must be
of type NSString, so convert the code to use string identifiers instead of
wxPointerObject.

Closes #13661.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-13 21:08:17 +00:00
Julian Smart
d86b82bb2c Applied #13738: Make a wxRichTextImage's box display around the image (dghart)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-13 19:06:53 +00:00
Dimitri Schoolwerth
9815c111d7 Regenerated Xcode projects.
Updated the Xcode projects to use timectrlg.cpp (renamed from timectrl.cpp).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-12 20:38:51 +00:00
Stefan Csomor
309f2b2031 adding defaults for Xcode builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-12 15:54:40 +00:00
Stefan Csomor
3d909cc42f reverting r69387 and r69389, fixes #13737
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-12 15:43:33 +00:00
Vadim Zeitlin
c28a4e5fa5 Rename src/generic/timectrl.cpp to timectrlg.cpp.
We can't use the same names for these files with VC6, it doesn't support this
and the project can't be built because of the output object file names
conflict.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-12 14:01:23 +00:00
Vadim Zeitlin
d4cf50c8b2 Remove the item before notifying about it in wxDataViewIndexListModel.
Remove the item from the internal representation of the model before calling
ItemDeleted() callback so that the callback sees the model in a consistent
state.

This is more consistent with the other callbacks (e.g. ItemAdded()) and other
models (e.g. wxDataViewVirtualListModel) and should fix crashes in wxOSX
version of the control.

Closes #13753.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-12 13:08:46 +00:00
Vadim Zeitlin
46e9b34a60 Always give error message when file-related functions fail.
Some failures in the file functions that usually did give error messages were
not reported, do log these errors too now.

Closes #13576.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-12 13:08:43 +00:00
Vadim Zeitlin
b4bdde879b Fix harmless warning in wxOSX with 10.7 SDK.
Use NSInteger instead of int in a declaration to avoid warnings about
declaration mismatch from g++ 4.2 under OS X 10.7.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-11 23:59:33 +00:00
Vadim Zeitlin
1677253b36 Minor corrections to event handling overview documentation.
Use "wx" prefix with the macros and correct the event methods used in the
example.

Closes #13752.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-11 23:51:18 +00:00
Vadim Zeitlin
bf79972894 Document that setting colours for native controls might not work.
Changing colours of the native controls can't be relied on.

See #13745.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-11 23:51:14 +00:00
Paul Cornett
565ed8bfd8 fix GetTextExtent with non-null font argument, fixes #13750
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-11 19:05:24 +00:00
Vadim Zeitlin
4cf1a9bf4a Ensure that Enter key presses are never stolen from wxButton in wxMSW.
This commit fixes the following bug: when an in-place editor control containing
an embedded button was used in wxDataViewCtrl, pressing Enter on the button
would close the editor, accepting changes, instead as (generic) wxDataViewCtrl
intercepts WXK_RETURN in its EVT_CHAR_HOOK handler. To prevent this from
happening, wxButton now handles EVT_CHAR_HOOK itself and never lets the parent
window intercept it if it's for WXK_RETURN. To ensure that normal
wxEVT_KEY_DOWN and wxEVT_CHAR are still generated in this case, wxButton
handler calls the new wxKeyEvent::DoAllowNextEvent() method that was added to
allow suppressing EVT_CHAR_HOOK only, without affecting the subsequent events.
DoAllowNextEvent() is currently only used in wxMSW but support for it was also
added to wxGTK and (both) wxOSX ports.

See #9102.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-11 17:03:56 +00:00
Paul Cornett
91614f1aa3 don't include files which may not exist in source release for a specific platform, fixes #13746
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-11 05:36:52 +00:00
Vadim Zeitlin
a4a06df3b4 Document wxFileConfig ctor.
This ctor was not documented at all because the comment preceding it was a
plain C++ comment and not a Doxygen one.

Do it now, especially as the logic of this ctor is not quite obvious.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-10 11:42:49 +00:00
Robin Dunn
5eb16fe200 Use default values for some parameters of wxSizerItem and wxGBSizerItem ctors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-10 04:34:06 +00:00
Vadim Zeitlin
e6d7f1efce Quote variables in -z tests correctly in wx-config.
The changes of r69944 broke wx-config for the traditional Unix systems (at
least Solaris and AIX, probably others too) which don't support using -z
without any value (unlike Linux/bash).

Fix this by quoting the possible empty variables in the tests.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-09 21:41:36 +00:00
Vadim Zeitlin
ccc0835d02 Rename wxRichToolTipPopup::SetBackground() method to avoid warnings in wxUniv.
wxUniv has SetBackground() in wxWindow so rename this one to
SetBackgroundColours() to avoid g++ warning about hiding a base class virtual.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-09 15:58:40 +00:00
Stefan Csomor
9c17ca3fe6 avoid accepting an invalid color, ignore it, as other ports do, fixes #13720
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-09 15:23:37 +00:00
Vadim Zeitlin
25fe875df6 Restore mouse capturing/releasing in wxPopupTransientWindow under MSW.
Partially revert the changes of r69350 to restore EVT_IDLE handling of
wxPopupTransientWindow under MSW. It turns out that we must release the mouse
for the embedded controls to work.

It would be better to solve the problem differently, e.g. perhaps maybe only
releasing mouse capture when mouse is clicked as the current code is fragile
but for now at least restore the functionality that used to work.

Closes #13740.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-09 15:20:55 +00:00
Stefan Csomor
815acb8e5a fixing copy size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-09 11:09:00 +00:00
Vadim Zeitlin
4fe4a7c50f Add wxEXEC_HIDE_CONSOLE flag allowing to unconditionally do it under MSW.
Also renamed wxEXEC_NOHIDE to wxEXEC_SHOW_CONSOLE for symmetry (keeping the
old name for compatibility, of course).

Extend exec sample to allow easily testing the different flags and adding more
of them later.

See #13676.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-08 20:22:55 +00:00
Vadim Zeitlin
0266103273 Explicitly document wxEXEC_XXX flags.
These flags were described in wxExecute() documentation but not clearly
documented individually, do it now.

Also reduce duplication of documentation in different wxExecute() overloads.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-08 20:22:52 +00:00
Stefan Csomor
46447d1ae8 copied from old cocoa code from David, fixes #13732
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-08 17:08:10 +00:00
Vadim Zeitlin
7ef791557a Allow using wxEvtHandler::Bind() with IBM xlC compiler v7+.
xlC 7 seems to be able to deal with this code without problems under AIX 5.3
so white list it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-08 15:58:45 +00:00
Vadim Zeitlin
1863484b08 Use '1'..'9' to simulate digits instead of WXK_NUMPADn.
Using WXK_NUMPADn with wxUIActionSimulator doesn't work under Unix, the
resulting GDK events have wrong keyval for some reason.

It would, of course, be nice to fix this but in the meanwhile use ASCII codes
to simulate the digits to at least allow doing this at all.

Also extend uiaction sample to allow testing text simulation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-08 15:55:40 +00:00
Vadim Zeitlin
64c502e828 Refactor to eliminate duplication in wxGTK key events generation code.
This also fixes a small bug with wxKeyEvent::m_uniChar not being always set
correctly to the same value as m_keyCode for ASCII characters.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-08 15:55:37 +00:00
Bryan Petty
20004800cf Regenerated new Doxygen custom HTML header, footer, and stylesheet with 1.7.6, but only for use with Doxygen 1.7.4.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-08 15:45:41 +00:00
Vadim Zeitlin
079b6a775a Fix Unicode key code for Ctrl-letter in wxGTK.
This was broken by changes in r69892 and just the letter was used as the key
code instead of Ctrl-letter as it used (and should) be.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-08 14:54:25 +00:00
Vadim Zeitlin
4ce3452d32 Only declare wxComboBox::Popup/Dismiss() when using Cocoa in wxOSX.
wxOSX/Carbon doesn't use the core implementation file so declaring these
methods for the Carbon version resulted in linking errors. Just don't do this,
they're not implemented for Carbon anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-08 14:47:37 +00:00
Vadim Zeitlin
53943b06e4 Refresh generic wxListCtrl after removing a column from it.
Deleting a column still kept it on display, at least until the next refresh,
e.g. resizing the window was enough to make it disappear.

Simply add a call to Refresh() to ensure that the column does disappear when
deleted.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-08 14:15:55 +00:00
Vadim Zeitlin
5fafec4d9f Document that wxEraseEvent::GetDC() never returns NULL.
This makes implementation of EVT_ERASE_BACKGROUND handlers simpler.

Closes #13736.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-08 13:07:53 +00:00
Vadim Zeitlin
b0c7cd8ed5 Correct the name of EVT_DATAVIEW_ITEM_START_EDITING event type in the docs.
START_EDITING is not the same as EDITING_STARTED.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-08 13:04:11 +00:00
Vadim Zeitlin
09fbcf2a62 Fix asserts when removing the menu item starting radio group in wxOSX.
Update m_startRadioGroup when removing the item it corresponds to.

Closes #13545.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-08 00:07:12 +00:00
Vadim Zeitlin
0e50659242 Set the tooltip for generic wxToolBar tools under wxOSX/Cocoa.
When using non-native toolbar, set the tooltip for tools m_controlHandle.

Closes #12362.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-07 23:55:38 +00:00
Vadim Zeitlin
cf82560a38 Work around impossibility to use wxCombobox in wxGrid in wxOSX.
Open the combobox when the editor is initially shown, this somehow ensures
that the combobox selection is taken into account when it is closed while
without this the selection is simply completely ignored.

This is just a hack but at least it allows to use wxGridCellChoiceEditor under
wxOSX which was previously impossible at all.

Closes #12644.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-07 23:41:14 +00:00
Vadim Zeitlin
f834239f59 Use NSApp abortModal instead of stopModal to end modal dialogs.
Using abortModal is apparently the right thing to do if the dialog is not
being closed as the result of user action (but e.g. because a timer expired)
and shouldn't change anything if it done because of something the user did
(e.g. clicked on a button).

Closes #12467.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-07 23:41:10 +00:00
Vadim Zeitlin
ff8cb900da Implement wxComboBox::Popup() and Dismiss() for wxOSX/Cocoa.
Unlike in the other ports, these methods currently don't generate any events
under OS X because these events are never generated at all there.

Closes #12642.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-07 23:41:06 +00:00
Vadim Zeitlin
f089d73634 Don't use gtk_menu_item_set_submenu() with NULL menu with GTK+ < 2.12.
In GTK+ 2.10 and earlier gtk_menu_item_remove_submenu() had to be used to
remove the items submenu as gtk_menu_item_set_submenu() gave errors when
passed NULL submenu, so call the old function when using old GTK+ version.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-07 23:21:06 +00:00
Paul Cornett
ffaaf1078e In Refresh(), allow for possibility that child is mapped and parent is not.
It turns out this can actually happen, and is apparently allowed by GTK.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-07 19:34:57 +00:00
Vadim Zeitlin
e0e022b067 Order the libraries correctly in wx-config for static linking.
The order of libraries matters when linking statically under UNIX. Ensure that
it is always correct in wx-config itself.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-07 16:13:26 +00:00