Commit Graph

111 Commits

Author SHA1 Message Date
Vadim Zeitlin
affd4b2c13 Make "Close" button affirmative ID in standard dialog button sizer.
This allows to use the Escape key to close a dialog with the "Close" button
only.

Closes #16185.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-04-28 11:28:29 +00:00
Václav Slavík
322877484d Fix wxWindowModalDialogEvent::GetReturnCode() on Windows.
*Lots* of native dialogs don't call SetReturnCode() in their ShowModal()
implementations in wxMSW. Rather than fixing them all - and having them
accidentally broken again and again in the future - fix this just in the
generic ShowWindowModal() implementation. This may not be the most elegant fix,
but it is bullet-proof.

Also revert previous attempt to fix just wxMessageDialog in r74776.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-10-28 07:48:14 +00:00
Paul Cornett
092162bc12 wxDialogBase only has one ctor, so just do initialization in ctor instead of Init()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-08-24 05:04:11 +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
Vadim Zeitlin
691745ab41 Add a public wxModalDialogHook class for intercepting modal dialogs.
Extract wxModalDialogHook from wx/testing.h into its own wx/modalhook.h,
extend it to allow to be notified not only about showing modal dialogs but
also about dismissing them and document it and show its use in the dialogs
sample.

Also replace all the WX_TESTING_SHOW_MODAL_HOOK macros occurrences with
WX_HOOK_MODAL_DIALOG.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-05-20 13:15:41 +00:00
Vadim Zeitlin
ce7fe42e84 Provide shorter synonyms for wxEVT_XXX constants.
Use the same short names as are used by the event table macros for the event
type constants themselves. This makes them much more comfortable to use, e.g.
Bind(wxEVT_BUTTON) compared to Bind(wxEVT_COMMAND_BUTTON_CLICKED).

The old long names are still kept for backwards compatibility and shouldn't be
removed as it doesn't really cost anything to continue providing them, but all
new event types should only use the short versions.

Closes #10661.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-04-25 10:11:03 +00:00
Václav Slavík
643e9cf9f6 Add wxTEST_DIALOG for testing of modal dialogs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-11-01 16:45:11 +00:00
Vadim Zeitlin
f821bc3617 Do use IsEscapeKey() in wxDialog escape key handling.
This method was added back in r40686 but was never actually used anywhere. Do
use it in wxDialogBase::OnCharHook() now instead of hard-coding the check for
WXK_ESCAPE, this should allow using Cmd+. to work like Escape under Mac which
was apparently the intention of the code in src/osx/dialog_osx.cpp.

Also fix IsEscapeKey() itself to ignore any modifiers as at least under MSW
Esc always closes the dialog, even if Shift or Alt is pressed.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-10-03 08:32:49 +00:00
Vadim Zeitlin
63415ba9f5 Don't interpret '&' specially in wxTextWrapper.
wxTextWrapper is used for the multiline text for which it doesn't make sense
to use mnemonics so don't interpret '&' specially in the text used with it.

Doing this also allows to remove the hack used in wxDialog::CreateTextSizer()
to deal with it that was used so far.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-18 21:56:36 +00:00
Paul Cornett
f313deaa38 move variable definitions to more appropriate places, remove now-empty src/common/datacmn.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-05 18:27:58 +00:00
Stefan Csomor
2895324520 merging back XTI branch part 2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 08:31:53 +00:00
Vadim Zeitlin
6d61520df3 Fix wxStandardDialogLayoutAdapter compilation with wxUSE_BUTTON==0.
This class probably should not be compiled in at all in the minimal build but
in the meanwhile just add #if checks around its button-related parts.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-10 13:51:57 +00:00
Vadim Zeitlin
ffc71ce59d Close a modal dialog even when it doesn't have any buttons.
The close button in the dialog title bar should work even if there are no
buttons in the dialog itself (unlike the Escape key which works as an
accelerator for a button), so close the dialog explicitly if the emulated
button click wasn't processed in wxDialogBase::OnCloseWindow().

Closes #12513.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-27 11:52:06 +00:00
Vadim Zeitlin
83a7613b71 Use the same logic for closing dialogs as for handling Escape key.
Pressing "Esc" key closed the dialog with only wxID_OK button (but no
wxID_CANCEL one) by default but pressing the "close window" button only closed
it if wxID_CANCEL was present.

Fix this by using the same code in OnCloseWindow() as in OnCharHook(), after
extracting it into the new SendCloseButtonClickEvent() method.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-09 20:53:26 +00:00
Vadim Zeitlin
b14cca2a84 Extract CreateSeparatedSizer() from wxDialog::CreateSeparatedButtonSizer().
Extract the code adding a separating wxStaticLine to the sizer in its own
function to be able to reuse it in upcoming commits.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-30 21:48:16 +00:00
Vadim Zeitlin
c79510ca12 Make the main message of wxGenericMessageDialog stand out.
Use larger bold font for the main message in wxGenericMessageDialog if the
extended message is also given to make it stand out similarly to how it
happens in the native GTK and MSW dialogs.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-19 15:41:18 +00:00
Vadim Zeitlin
5276b0a53c Use wxDELETE() and wxDELETEA() when possible.
Use wxDELETE[A]() functions which automatically NULL out their arguments after
deleting them instead of doing it manually.

Closes #9685.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-06-20 18:18:23 +00:00
Vadim Zeitlin
cdc48273b4 Fix bug with using uninitialized flags in GetParentForModalDialog().
GetParentForModalDialog() was called from the ctor initialized list before
m_windowStyle could be initialized by the base class ctor in several different
places, meaning that the check for wxDIALOG_NO_PARENT in this function was
using uninitialized variable.

Fix this by passing the style parameter explicitly to this function to allow
using it from derived class ctors. Still keep an overload which uses the
actual window parent and flags which is simpler to use for later calls to this
function.

Thanks valgrind for finding this one.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-18 00:05:37 +00:00
Robin Dunn
9f88f9fbf0 Use the correct event class for the window modal notification
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-03-01 22:54:15 +00:00
Kevin Ollivier
2482282d47 Fix for generic implementation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-01-23 22:45:24 +00:00
Kevin Ollivier
2d4c4ba89b Fix for non-Mac builds.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-01-23 21:17:19 +00:00
Vadim Zeitlin
d1b5dd5596 Correct wxPendingDelete declaration.
This variable was moved to wxBase from wxCore recently and hence must be
declared using WXDLLIMPEXP_DATA_BASE and not WXDLLIMPEXP_DATA_CORE now.

Closes #11202.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-15 17:05:24 +00:00
Vadim Zeitlin
03647350fc No changes, just removed hard tabs and trailing white space.
This commit is huge but there are no non-white-space changes in it.

Some files containing third-party sources (src/msw/wince/time.cpp,
src/x11/pango*.cpp) were left unchanged.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-08-21 10:41:26 +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
255c07b4df extracted wxTextWrapper in its own header and made it public
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-31 20:12:07 +00:00
Stefan Csomor
ebcd855cc9 missing classinfo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-13 07:51:30 +00:00
Stefan Csomor
94b4dd5499 add window-modal dialog calls and fallback implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-13 07:01:51 +00:00
Vadim Zeitlin
53e34ee6fa VC6 compilation fix (thanks buildbot)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-12 14:10:06 +00:00
Vadim Zeitlin
4f73f25cc8 don't use GetParent() in GetParentForModalDialog() itself as it can be called before m_parent is initialized
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-09 16:55:37 +00:00
Vadim Zeitlin
8bda0ec6a3 remove wxMSW-specific FindSuitableParent() and use GetParentForModalDialog() everywhere; extend it with additional checks and remove redundant ones elsewhere
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-09 12:26:15 +00:00
Vadim Zeitlin
c84d0c864a generate the click event from the button with correct id if SetEscapeId() was called instead of always using wxID_CANCEL (closes #10746)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-07 17:09:21 +00:00
Julian Smart
3e84eb5fa2 Restore control focus after adaptation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-21 11:48:53 +00:00
Vadim Zeitlin
e822d1bd5f fix more Borland release build warnings about unused variable/code without effect
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-20 10:30:49 +00:00
Václav Slavík
f8b3f03601 compilation fix for wxUSE_BOOKCTRL=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-31 22:00:33 +00:00
Vadim Zeitlin
728cf0ad42 compilation fix for wxUSE_DISPLAY==0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-05 00:02:29 +00:00
Julian Smart
52519733ce Added missing include
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-29 17:13:59 +00:00
Julian Smart
3aa8e4ea6d Added automatic dialog scrolling ability
Added ability to resize wizard bitmaps automatically
Made it easier to derive from wxWizard and override behaviour,
mainly by making members protected instead of private



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-29 16:35:39 +00:00
Vadim Zeitlin
8d22935dcb unused parameter warning fixes for --disable-all-features build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-11 12:55:43 +00:00
Julian Smart
a45f904dea Skip the event to allow further child processing
Don't change the background colour explicitly on wxGTK


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-27 17:37:54 +00:00
Václav Slavík
049908c573 make wxFrame a wxControlContainer too, so that it behaves in the same way as wxDialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-13 16:29:23 +00:00
Vadim Zeitlin
9dcf65d3c1 fixed typo in IsBeingDeleted() test in GetParentForModalDialog()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-05 12:35:36 +00:00
Vadim Zeitlin
893f78406d test that the candidate parent window isn't being deleted (this would result in a crash later)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-23 20:07:26 +00:00
Vadim Zeitlin
df57f6bea3 compilation fixes for PCH-less build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-22 22:20:57 +00:00
Vadim Zeitlin
2229243bdf added wxDialog::GetParentForModalDialog() and use it to try to always create modal dialogs with a parent (slightly modified patch 1702962)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-22 20:34:41 +00:00
Vadim Zeitlin
57d7f9888e added wxAPPLY and wxCLOSE flags to CreateStdDialogButtonSizer() (Marcin Wojdyr)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-14 13:17:06 +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
de160b0647 don't use wxControlContainer if wxHAS_NATIVE_TAB_TRAVERSAL is defined (currently it never is)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-25 22:41:11 +00:00
Vadim Zeitlin
25eb10d2e1 added CreateSeparatedButtonSizer(), changed signature and semantics of CreateButtonSizer()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-09 21:10:22 +00:00
Václav Slavík
dbfa7f339c compilation fix for !wxUSE_BUTTON
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-23 10:45:51 +00:00
Vadim Zeitlin
a9f620daf4 don't use dynamic handlers for standard buttons as this prevents static event handlers in derived classes from working; just catch all button events in a static handler instead
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-20 14:02:51 +00:00