Commit Graph

58 Commits

Author SHA1 Message Date
Paul Cornett
00cc0233f6 fix releasing mouse capture before showing modal dialog, see #16647
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-11-14 18:56:37 +00:00
Vadim Zeitlin
3b1de0dc8b Use TLW parent for wxMessageDialog in all ports.
This avoids problems with deleting child windows which are parents of
wxMessageDialog before the dialog itself is destroyed and was already done in
wxGTK, but not in wxMSW nor wxOSX. Do it in all ports now by calling
GetParentForModalDialog() from wxMessageDialogBase ctor itself instead of
depending on the port-specific wxMessageDialog to do it.

Closes #16631.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-10-19 12:56: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
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
3c2f3a60d1 Disable Unity global menu while native modal dialogs are shown in wxGTK.
We need to use wxOpenModalDialogLocker even with native GTK+ dialogs to
prevent the menu commands from being available while they're shown, so do it
in wxMessageDialog and wxColourDialog which call gtk_dialog_run().

Closes #14823.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-03-21 22:36:46 +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
Paul Cornett
8ab7533289 Disconnect all GTK signals referencing a wx object which is being destructed
or which is destroying the associated GTK object


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-10-17 16:23:18 +00:00
Paul Cornett
4e621d2471 update minimum GTK2 version requirement to 2.6
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-10 16:39:44 +00:00
Paul Cornett
9dc44eff02 support for GTK3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 20:39:06 +00:00
Vadim Zeitlin
7112cdd1f3 Add support for wxHELP button to wxMessageDialog.
Implement support for wxHELP for wxMSW, wxGTK and wxOSX/Cocoa (at least when
showing the message box from the main thread, there doesn't seem to be any way
to show more than three buttons with CFUserNotificationDisplayAlert() so
"Help" button is not supported when using it).

This is useful not only on its own, i.e. to allow the user to ask for help,
but also because it brings the total number of buttons supported by the
message dialog to 4, meaning that more choices can be offered to the user
(which is rarely, but not quite never, useful).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-04 22:53:42 +00:00
Vadim Zeitlin
5d3056f180 Fix button order in wxGTK wxMessageDialog and wxStdDialogButtonSizer.
The order of buttons in wxGTK wxMessageDialog was accidentally broken since
r55482 and wxStdDialogButtonSizer implementation for wxGTK was subsequently
modified to work in the same way as the broken version of wxMessageDialog.

Fix wxMessageDialog and remove the "compatibility" workarounds from
wxStdDialogButtonSizer to restore correct behaviour in both places.

Closes #12565.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-15 23:45:58 +00:00
Vadim Zeitlin
ede7b01760 Provide a task-dialog based wxMSW wxMessageDialog implementation.
Use the task dialog instead of the legacy message box for wxMessageDialog
implementation under wxMSW on recent (Vista and later) Windows versions.

As part of this change, remove wxMessageDialogWithCustomLabels and integrate
its functionality in wxMessageDialogBase itself as it's now used by all
platforms.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-18 22:48:28 +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
Vadim Zeitlin
a4578b0ced Add wxMessageDialog::GetEffectiveIcon() and use it in all ports.
Remove code duplication and inconsistencies among different ports by using a
single function in the base class for the determination of the effective icon
style to use, correctly handling both wxICON_NONE and the absence of any
wxICON_XXX styles.

Closes #11822.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-03-20 13:18:23 +00:00
Vadim Zeitlin
ce668f297b Extract conversion from wx to GtkMessageType in a separate file.
Add wxGTKImpl::ConvertMessageTypeFromWX() function to convert from wxICON_XXX
styles to GTK_MESSAGE_XXX values.

This will be reused by wxInfoBar in the next commits.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-05 22:54:36 +00:00
Julian Smart
426d19f139 Applied patch #9058 (add Hildon 2.0 support)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-24 12:36:34 +00:00
Vadim Zeitlin
4566dcbe24 Implement wxSTAY_ON_TOP for wxMessageDialog in wxGTK.
Call gtk_window_set_keep_above() to force the message dialog to be above the
other windows (some WMs do this by default anyhow but not all).

Closes #11163.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-04 16:20:57 +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
7e3204b45c added wxICON_NONE and implement support for it in wxGTK (closes #2897)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-28 16:25:37 +00:00
Vadim Zeitlin
24689293df add wxCANCEL_DEFAULT support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-12 00:06:42 +00:00
Vadim Zeitlin
150c8eb919 add wxGTK_CONVs to fix STL and ANSI builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-06 15:41:12 +00:00
Vadim Zeitlin
e08931c05a make it possible to use stock ids for custom message box labels
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-05 18:02:49 +00:00
Vadim Zeitlin
9276358892 added support for custom labels in wxMessageBox for wxGTK too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-05 17:27:20 +00:00
Vadim Zeitlin
ae3ac32d72 removed unnceessary gtk_window_set_transient_for() call already done by gtk_message_dialog_new() itself
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-05 10:24:39 +00:00
Paul Cornett
9ff9d30c0a Hold a reference on m_widget for the life of the associated wxWindow object.
This allows removing some ugly hacks, and leaking of GtkWidgets by wxNotebook.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-08-26 16:19:23 +00:00
Vadim Zeitlin
c96d7bec67 use more natively looking HildonNote instead of GtkMessageDialog under Maemo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-12 20:39:06 +00:00
Vadim Zeitlin
ff654490b7 removed all compile- and run-time checks for GTK+ < 2.4; don't include the generic files which are now never used in wxGTK in the build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-05 22:31:24 +00:00
Vadim Zeitlin
7738af5957 relinquish the mouse capture when a dialog is about to be made modal to ensure that the mouse can be used in it (patch 1754648)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-08-15 21:01:30 +00:00
Vadim Zeitlin
1878d1ecef also correct run-time check for gtk_message_dialog_format_secondary_text() availability
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-01 12:16:05 +00:00
Robert Roebling
ff9bb105a0 Correct GTK version check
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-26 22:06:47 +00:00
Vadim Zeitlin
2afb9e1690 1. Derive wxMessageDialogBase from wxDialog (why did we use multiple
inheritance here?), moved more wxMessageDialog fields into the base class
2. Added functions to set the text of message box buttons (patch 1700393,
   currently only implemented for wxMac)
3. Added wxMessageDialog::SetMessage() and SetExtendedMessage() and
   implemented them for wxMac (part of the patch), wxGTK 2.4+ and in
   a generic way for everybody else
4. Allow changing the dialog attributes between creating and showing it,
   for this the real dialog creation is now done on in ShowModal() in all
   ports


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-24 12:50:42 +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
f4322df68b no changes, just removed TABs/trailing spaces
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-07 22:56:34 +00:00
Robert Roebling
d182ca1ba6 [ 1603286 ] make wxMessageDialog Gnome HIG conform for yes_no+cancel
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-26 18:46:00 +00:00
Włodzimierz Skiba
88a7a4e10e Include wx/intl.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-25 14:38:19 +00:00
Mart Raudsepp
8907154c1a Nuke #pragma implementation/interface's
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-23 12:56:45 +00:00
Włodzimierz Skiba
e5b5075810 Base for wxMessageDialog with common checks for style.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-11 15:34:42 +00:00
Robert Roebling
3b439e60e0 This change will make the parent TLW come to
the front again after it has been sent to
    the back for some unknown reason, after a
    message dialog has been show.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-28 15:14:20 +00:00
Robert Roebling
a733492856 Reverted changes that set m_widget to NULL in native
GTK+ dialogs for now. The problem persists, that
    when quitting the native file dialog with ESC, the
    dialog will be destroyed twice.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-28 13:08:26 +00:00
Robert Roebling
f1dec25f31 Avoid error message when closing message
dialog with the X field from the WM.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-27 23:21:12 +00:00
Robert Roebling
e1bf3ad3e8 Applied patch to reorder includes. Not the most
important patch in the world, but still.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-03 21:13:28 +00:00
Václav Slavík
0e4a70455a more recognized response types
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-20 17:19:59 +00:00
Václav Slavík
633c71efce set transiency relation so that the WM can do better job of positioning the window
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-04 11:40:06 +00:00
Julian Smart
655719367a Use old licence name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 20:53:33 +00:00
Julian Smart
77ffb5937e Name and version changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 14:56:36 +00:00
Robin Dunn
b2ce5e1b27 Implement some base class virtuals to avoid errors related to this not
being a true wxDialog


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-02 01:55:29 +00:00
Vadim Zeitlin
e0ae1a0ae9 auto detect the icon if none given instead of asserting (MSW and Mac do allow this)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-22 17:42:49 +00:00
Vadim Zeitlin
1840af0319 reuse existing wxGetTopLevelParent() function in wxMessageDialog ctor instead of reimplementing it (yes, it is just 4 lines, but this still was enough for a fatal bug to slip in them...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-20 12:49:43 +00:00
Robert Roebling
7aad0bf32e i
Allow NULL parent in message dialog.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-20 12:28:12 +00:00
Robert Roebling
abb492ba03 Allow non-toplevel-window to given as the
parent of a message dialog (as it is done
   in the controls sample).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-16 11:54:45 +00:00