Commit Graph

147 Commits

Author SHA1 Message Date
Paul Cornett
50ca21f966 Fix cursor inheritance and busy cursor/global cursor, closes #15801
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-01-23 18:27:13 +00:00
Paul Cornett
a31e87879e remove redundant initialization of base class member variables
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-08-24 05:11:28 +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
d3bd8b1a48 Create a small helper class for Unity global menu bug workaround.
Encapsulate the code temporarily incrementing wxOpenModalDialogsCount in a
small helper class to make it easier to reuse it elsewhere.

See #14823.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-03-21 22:36:42 +00:00
Paul Cornett
ddb19489c0 remove ancient SetModal(), it was deprecated long ago and is not present in wxMSW or wxOSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-01-03 05:09:20 +00:00
Paul Cornett
4ea2d0d573 Fix for toolbars and menus not being disabled on Ubuntu
Ubuntu overlay scrollbar changes the GtkWindowGroup for its toplevel, which is
disastrous for modal windows. Put in a hack to detect and undo this.
Fixes #14855


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-12-16 07:14:40 +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
Stefan Csomor
5c06430713 fixing duplicate rti info for gtk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 09:20:10 +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
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
664e13143e renamed wx/ptr_shrd.h to wx/sharedptr.h; split wx/ptr_scpd.h in wx/scopedptr.h and wx/scopedarray.h; extracted common parts into new wx/checkeddelete.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-03 12:01:46 +00:00
Vadim Zeitlin
c6212a0cb7 set m_isBeingDeleted to true (only) in SendDestroyEvent(); call it as early as possible during the window destruction to ensure that destroy event handlers can still access the full window object
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-20 18:33:33 +00:00
Vadim Zeitlin
5c69ef61f3 fix some of icc 11.0 warnings and disable a few others
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-16 14:24:13 +00:00
Vadim Zeitlin
bfafa6288f don't terminate the event loop in EndModal() if it was already terminated because of an exception thrown inside it (#9838)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-08-18 11:51:53 +00:00
Vadim Zeitlin
dc28b8564e allow wxDialog::ShowModal() after Show() (see #1416, #4658, #4664)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-22 14:40:25 +00:00
Vadim Zeitlin
4e2a377838 assert if ShowModal() is called after a previous Show() (#1416)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-21 16:51:42 +00:00
Paul Cornett
8fb09a08c7 forward Show() to base, not wxWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-28 06:34:01 +00:00
Václav Slavík
0af07cc245 fixed wxGTK assert when closing wxMessageDialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-09 10:39:08 +00:00
Václav Slavík
a9efc294a9 call Show(false) from ~wxDialog to call EndModal if the dialog is still modal consistently in all ports
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-05 19:13:26 +00:00
Václav Slavík
dc409d37f2 clarified EndModal assert message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-30 19:49:24 +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
64c11164f0 rename g_openDialogs to wxOpenModalDialogsCount and define it in toplevel.cpp to fix wxUniv/GTK linking issues
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-17 20:50:44 +00:00
Paul Cornett
cca410b336 Use a GtkVBox to do TLW layout. Rework some of the remaining sizing code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-24 18:07: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
b46b1d59d6 implement event loop for console applications (heavily modified patch 1715735)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-14 23:43:39 +00:00
Paul Cornett
b541538fa5 move definitions from src/gtk/data.cpp to other appropriate places
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-05 19:49:02 +00:00
Vadim Zeitlin
31fdb8d993 use GetParentForModalDialog() in ShowModal() to ensure we don't select a window being deleted as parent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-23 20:09:35 +00:00
Vadim Zeitlin
02d5015b1c fixed incorrectly inversed test for parent [not] being deleted (patch 1624472)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-29 20:16:53 +00:00
Paul Cornett
b5e31cc8e2 GtkOnSize parameters aren't useful
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-07 16:06:47 +00:00
Vadim Zeitlin
2158f4d798 moved all wxDialog event handlers to wxDialogBase to avoid code duplication
(sixplication?) among ports; as a side effect added public wxDialog methods to
wxDialogBase as well and moved EndDialog() (previously implemented by wxMSW,
wxMotif, wxMac and wxCocoa but not the other ports) to wxDialogBase too


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-19 22:56:11 +00:00
Vadim Zeitlin
f36630afc9 use gtk_window_set_modal(TRUE/FALSE) instead of gtk_grab_add/remove() (part of patch 1472329)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-31 22:48:22 +00:00
Włodzimierz Skiba
c8326d649c Include wx/cursor.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-22 07:11:26 +00:00
Włodzimierz Skiba
76b49cf49b Include wx/frame.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-05 08:10:55 +00:00
Włodzimierz Skiba
670f993563 Include wx/app.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-28 12:44:37 +00:00
Mart Raudsepp
dfdc483a23 Revert revision 1.102.2.2:
date: 2002/10/13 21:03:45;  author: RR;  state: Exp;  lines: +4 -2

  Combox gets its own SetFocus()
  wxDialog() set the focus to itself when shown. This will
    the propagate to some control in the dialog. I am not
    sure if this will override preceding user's call to
    SetFocus() in one of the child windows.
=========================
It will override preceding users call to SetFocus, effectively introducing bug #1288889 (wxWindow::SetFocus does not
work on modal dialogs, and therefore wxButton::SetDefault does not work either). Reverting fixes that. Need to
investigate why it was needed in relation to Comboboxes, but SetFocus/SetDefault breakage is worser imho, hence the
revert for now.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-26 12:53:29 +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
Václav Slavík
924b84ab94 changed exceptions handling to work under wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-20 08:20:50 +00:00
Włodzimierz Skiba
91af089567 Second part of '[ 1216148 ] cleanup: unused variables and declarations'.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-08 14:49:36 +00:00
Dimitri Schoolwerth
2a21ac1590 applied patch #935127: "wxDIALOG_MODAL and wxDIALOG_MODELESS cleaning"; some cosmetic cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-25 12:44:56 +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
Václav Slavík
14f355c2b5 added support for gcc precompiled headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 12:46:53 +00:00
Vadim Zeitlin
2b5f62a0b2 merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-04 14:11:26 +00:00
Vadim Zeitlin
39cc7a0bae added wxWS_EX_TRANSIENT, added code for handling it and fixed wxLogGeneric
to avoid crashes related to creating the log dialog as child of a window which
is destroyed before it is


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-30 23:40:12 +00:00
Vadim Zeitlin
e058b98d8a don't use windows about to be destroyed as implicit dialog parent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-20 00:10:51 +00:00
Vadim Zeitlin
82c9f85ce5 added wxTLW for MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-24 00:34:14 +00:00
Václav Slavík
21f4383ae7 wxTOPLEVEL_EX_DIALOG is a better name than wxTLW_EX_DIALOG
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-22 22:39:03 +00:00
Václav Slavík
7d9f12f3b9 wxTopLevelWindow (only for wxGTK for now)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-15 22:13:08 +00:00