Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,966 Commits 1 Branch 330 Tags
c78f0857639ac0f14a1c4cc3eaa48cde46dac9f2
Commit Graph

49 Commits

Author SHA1 Message Date
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
Dimitri Schoolwerth
80fdcdb90e No changes, synchronised source names that appear commented at the top of files with the actual path to the files. 
Fixed commented names (path, filename, and extension) of files in include/ and src/. Prepended the names in src/ with "src/" everywhere, while starting those in include/wx/ with "wx/".

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-03-20 00:14:35 +00:00
Vadim Zeitlin
b8b9e48c51 Put storage class outside WXDLLIMPEXP_DATA_CORE() macros. 
The storage class must come first in a declaration so put it in front of
WXDLLIMPEXP_DATA_CORE() and not inside it to avoid warnings from some
compilers (notably Intel one).

Closes #12932.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-02-22 13:25:51 +00:00
Vadim Zeitlin
d20ba5f860 Allow using custom labels for wxGenericMessageDialog buttons. 
Custom labels set for wxGenericMessageDialog buttons were simply ignored as it
used CreateSeparatedButtonSizer() to create the actual buttons which in turn
always used the standard labels.

Fix this by explicitly creating the buttons with custom labels if necessary.

This also fixes custom label support in wxGenericRichMessageDialog deriving
from this class.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-08-30 21:48:21 +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
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
Mattia Barbon
b91d65b10f Build with WXINTL_NO_GETTEXT_MACRO defined. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-01-02 11:22:59 +00:00
Vadim Zeitlin
3b5137c4e0 Use wxSTOCK_FOR_BUTTON for message dialog custom labels. 
This allows to use wxID_PRINT as a custom label without getting an unwanted ellipsis at the end.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-07-25 16:41:16 +00:00
Vadim Zeitlin
3c9a70ddd4 correct wrong assert checking for default button flags consistency (closes #10906) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-06-17 23:16:22 +00:00
Vadim Zeitlin
9053c7b9c1 fix warnings about empty controlling statement in release build 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-23 13:10:19 +00:00
Vadim Zeitlin
657a8a3598 first round of debug/release merge: introduce wxDEBUG_LEVEL, for now defined as 1 if __WXDEBUG__ is defined, i.e. no real changes; don't use __WXDEBUG__ in the headers to keep debug and release builds ABI-compatible; add functions to customize or disable asserts handling 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-21 23:36:37 +00:00
Vadim Zeitlin
c0c133e13b add wx-prefixed and semicolon-requiring versions of DECLARE_NO_{COPY,ASSIGN}_CLASS macros 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-02-08 11:45:59 +00:00
Paul Cornett
41285bc82f fix GCC warning "suggest explicit braces..." 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-02 18:10:10 +00:00
Francesco Montorsi
5bc4758090 make more readable the checks for incoherent style flags 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-11-28 17:58:39 +00:00
Vadim Zeitlin
f45d6ade08 added wxCANCEL_DEFAULT style to wxMessageDialog (only implemented for MSW for now); also tightened up the style checks in wxMessageDialog::SetMessageDialogStyle() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-09-11 23:37:35 +00:00
Vadim Zeitlin
298c25c3a5 allow passing literal strings and results of c_str() to SetXXXLabels() methods too 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-09-05 18:29:06 +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
23e00c551b implement support for custom button labels in wxMessageBox under MSW; refactor the code to reuse the existing setters in Mac ports for MSW as well 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-09-05 14:39:36 +00:00
Vadim Zeitlin
2c6dbc21b9 no changes, just de-TAB-bed 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-08-30 22:01:20 +00:00
Stefan Csomor
ef0e92205a fixing file paths after renaming 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-06-11 19:17:41 +00:00
Francesco Montorsi
53a2db124c substitute WXDLLEXPORT with WXDLLIMPEXP_CORE and WXDLLEXPORT_DATA with WXDLLIMPEXP_DATA_CORE 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-03-26 15:06:00 +00:00
Vadim Zeitlin
f36e602b3f make various control names constants of type char, not wxChar, as this is more compatible with the old ANSI build and it doesn't make much sense to use wchar_t for ASCII strings anyhow 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-11-12 21:37:46 +00:00
David Elliott
e9871aaf86 Applied slightly-modified patch 1826540 from Gareth Simpson. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-11-09 18:11:17 +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
Mart Raudsepp
1be7a35c5e Include gtk1 headers for non-gtk2. I don't really like this CPP logic, or more exactly __WXGTK__ without __WXGTK20__ 
being GTK1, oh well.
Might have missed some.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-01-23 03:27:34 +00:00
Julian Smart
99d800190a Added licence/copyright information 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-05-04 18:57:50 +00:00
Włodzimierz Skiba
2ecf902bc8 Use defs.h (and automatically setup.h and chkconf.h) before first wxUSE_* check (bug #1164141). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-03-16 16:18:31 +00:00
David Elliott
a685a06c96 Fix compilation of generic message dialog. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-03-12 19:35:44 +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
Włodzimierz Skiba
4055ed8281 Use __WXPALMOS__ for PalmOS port which fits __WX$(TOOLKIT)__ of bakefiles. Do not depend on MSW macros in PalmOS port. Source cleaning. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-12-20 12:44:22 +00:00
Julian Smart
ffecfa5aeb Committed William Osborne's wxPalmOS port 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-10-19 13:40:30 +00:00
Włodzimierz Skiba
4e32eea148 Source cleaning: whitespaces, tabs, -1/wxDefaultCoord/wxID_ANY/wxNOT_FOUND, TRUE/true, FALSE/false. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-09-17 22:23:59 +00:00
Robert Roebling
47e118ba9a GPE uses generic dialogs. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-02-28 15:27:11 +00:00
David Elliott
0201182bf5 Use generic implementation for wxCocoa 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-03-22 06:13:03 +00:00
Václav Slavík
13a7abf973 added native wxMessageDialog implementation for GTK+2 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-02-28 23:37:46 +00:00
Mattia Barbon
e9e4acc519 Remove #ifdef __WXSTUBS__ from headers. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-01-04 09:22:53 +00:00
Vadim Zeitlin
6e711d5c09 applied patch 446836: removed qt headers 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11469 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-08-25 14:52:26 +00:00
Julian Smart
217099990c Further wxUniv fixes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-06-29 19:18:30 +00:00
Vadim Zeitlin
e421922f90 MSW compilation fixes - widgets sample runs! 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2001-06-27 00:27:24 +00:00
Robert Roebling
92afa2b150 Did somework on the generic dialogs, 
Renamed wxBox -> wxBoxSizer
  Removed old dialog layout code,


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-08-11 11:53:40 +00:00
David Webster
1777b9bbf4 *** empty log message *** 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-07-28 03:38:12 +00:00
Vadim Zeitlin
bf6c2b3505 1. wxGrid fixes contributed by Gerhard Gruber (client data for cells...) 
2. Motif warnings removed
3. Using native msgbox under Motif (ok, it doesn't work, but generic doesn't
   work neither)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-06-29 13:13:11 +00:00
Robert Roebling
57dde4bd58 Added wxGTK-only cmn dialogs. 
Fixed a few includes and installing makefiles.
  Updated testconf accordingly.

  Good fences make good neighbours.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-06-26 11:56:44 +00:00
Stefan Csomor
17dff81c71 mac support as stubs added 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1999-01-01 16:22:21 +00:00
Julian Smart
34138703c3 Changes mostly as a result of __WXSTUBS__ compilation. The stubs code now 
compiles under Windows with VC++. Also OGL enhancements espec. wxDrawnShape.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1998-08-15 00:23:28 +00:00
Robert Roebling
b4e76e0d7e More work on wxQt integration, configure 
I tried notr to break anything...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1998-08-07 20:23:17 +00:00
Karsten Ballüder
2049ba38ad Changed __GTK__, __WINDOWS__ and __MOTIF__ to __WXGTK__, __WXMSW__ and __WXMOTIF__ 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1998-07-10 14:15:17 +00:00
Karsten Ballüder
c801d85f15 Initial revision 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 1998-05-20 14:01:55 +00:00