Commit Graph

81 Commits

Author SHA1 Message Date
Troels Knakkergaard
d71d1a50e5 Use the appropriate parent for the choice dialogs
Fall back to the main application window if no parent was explicitly specified
using the standard GetParentForModalDialog() method.

See #17295

(cherry picked from commit 50435ef678)
2015-12-22 19:58:41 -08: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
fc12b1f12a Take void** client data in wxSingleChoiceDialog ctor and not char**.
The client data is supposed to be untyped, there is really no reason (other
than compatibility with C conventions of 40 years ago) to use char** here.
So don't do it and provide the versions taking "void**" keeping "char**" ones
for backwards compatibility only.

Also deprecate GetSelectionClientData() that returned char* and add a new
GetSelectionData() returning void* instead.

Closes #13876.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-02-05 14:18:33 +00:00
Vadim Zeitlin
e0856740af Fix the selection validity check in wxSingleChoiceDialog.
Fix the typo ("> 0" was used instead of ">= 0") introduced in r63731.

Closes #11844.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-03-22 11:40:19 +00:00
Vadim Zeitlin
697f4a966e Add initial selection parameter to wxGetSingleChoice() functions.
Allow to easily specify the initially selected item.

Closes #11749.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-03-21 11:06:31 +00:00
Vadim Zeitlin
12a124ddc9 remove confusing wxDialog::ButtonSizerFlags and extract button styles properly in each generic dialog implementation instead (closes #9836)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-23 08:56:32 +00:00
Vadim Zeitlin
e5cfb314ae replace wxGetMultipleChoices() with wxGetSelectedChoices() which allows to distinguish between cancelling the dialog and not selecting any items in it (closes #10057)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-07 15:39:09 +00:00
Vadim Zeitlin
61a11cd6fa don't limit the multiple choice dialog size to 300x200 pixels on big screens, this doesn't make sense
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-08-21 16:42:17 +00:00
Julian Smart
6fe7685d0c Made choice convenient dialog more, well, convenient: fixed lack of vertical
expansion and increased list size for larger screens.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-06 09:56:43 +00:00
Robin Dunn
cb5d54ff9e Don't use wxLB_EXTENDED with the checklistbox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-13 18:09:21 +00:00
Julian Smart
abc2857fa0 Corrected wxMultiChoiceDialog if wxCheckListBox is used
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-13 17:08:23 +00:00
Vadim Zeitlin
bd9f3519cf use wxSizerFlags and updated CreateButtonSizer() in all generic dialogs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-09 21:08:45 +00:00
Włodzimierz Skiba
f43255e838 No more avoiding wxSizer::Fit in wxWinCE builds.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-30 00:20:54 +00:00
Włodzimierz Skiba
897b24cf5c More common code moved from generic dialogs to wxDialogBase::CreateButtonSizer(). New system option 'wince.dialog.real-ok-cancel'.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-15 10:06:15 +00:00
Stefan Csomor
a319ce7d74 layout adaptions for mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-05 11:26:07 +00:00
Chris Elliott
63c02113db add missing header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-02 09:49:16 +00:00
Włodzimierz Skiba
60104cbafa wxMultiChoiceDialog uses now wxCheckListBox if possible, wxListBox if not
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-01 22:35:50 +00:00
Włodzimierz Skiba
7b504551c2 Pressing build-in joystick on WinCE phones fires wxEVT_JOY_BUTTON_DOWN event.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-29 12:48:07 +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
Julian Smart
aa66250ba4 Further WinCE adaptations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-02 17:44:12 +00:00
Robert Roebling
acf2ac3757 Applied modified form of the StdButtonSize patch.
Tested on GTK2, MSW and Mac.
  Adapted various generic dialogs to stretch the
    button sizer so that the buttons don't end
    up centered but right aligned.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-31 18:57:25 +00:00
Vadim Zeitlin
b2d739ba55 don't preselect the first item if the array with the initial selections is empty in wxMultiChoiceDialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-27 19:23:59 +00:00
Włodzimierz Skiba
9a35701127 Hardware defines spec.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 17:29:37 +00:00
Vadim Zeitlin
d0cc483d17 unselect previously selected items in SetSelection() (patch 974326)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-25 15:06:58 +00:00
Václav Slavík
8316ff5d98 respect absence of wxCENTRE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-28 21:46:05 +00:00
Włodzimierz Skiba
4b0881393c Private macro moved in waiting for DektopPolicy implementation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-23 11:55:33 +00:00
Włodzimierz Skiba
718970e590 Preserve previous state of sizers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-23 10:57:33 +00:00
Włodzimierz Skiba
119727ad9e Shortcuts for avoiding #ifdef __SMARTPHONE__ conditions.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-23 10:44:16 +00:00
Włodzimierz Skiba
64c794f682 Choices dialog adjustement to SmartPhone.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-22 08:23:19 +00:00
Włodzimierz Skiba
ca65c0440a Code cleaning: wxID_ANY, wxDefaultSize, wxDefaultPosition, true, false, wxEmptyString, tabs and white spaces.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-17 16:22:36 +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
Mattia Barbon
584ad2a32f Added some missing STL-like wxArray/wxArrayString constructors.
Added helper class wxCArrayString, better replacement for
wxArrayString::GetStringArray.
  Added overloaded constructors and Create() methods taking
a wxArrayString for wxCheckListBox, wxChoice, wxComboBox,
wxListBox, wxRadioBox, wxSingleChoiceDialog, wxMultipleChoiceDialog.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-31 18:21:45 +00:00
Julian Smart
6463b9f539 Reverted patch [ 832096 ] Final separation for GUI and console for Open Watcom
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-15 13:49:22 +00:00
Julian Smart
1169a91932 Applied patch [ 832096 ] Final separation for GUI and console for Open Watcom
(Watcom compiler doesn't like ctor implementation in headers)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-11 15:33:01 +00:00
Václav Slavík
a3bf7524f3 removed WXWIN_COMPATIBILITY and WXWIN_COMPATIBILITY_2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-17 12:50:53 +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
Mattia Barbon
2da2f941bb Fix wx[Sorted]ArrayString::Index when wxUSE_STL=1, because
it is different than wxArray::Index (second argument is for
case sensitivity, not search direction).
  Use forward declaration for wx[Sorted]ArrayString, where
possible.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-19 22:01:14 +00:00
Vadim Zeitlin
13a6fb3a25 don't hardcode wxCHOICEDLG_DIALOG_STYLE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-27 13:30:01 +00:00
Vadim Zeitlin
72ad377f13 Unicode compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-24 19:33:40 +00:00
Julian Smart
6aa89a22b8 Fixed copyrights and licence spelling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-17 11:55:54 +00:00
Mattia Barbon
643e16ac3b Fix wxSingleChoiceDialog under wxMotif.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-19 09:56:03 +00:00
Julian Smart
59af5f19d0 Set the selection under Motif in wxChoiceDialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-19 09:59:03 +00:00
Robin Dunn
ea6601756a Fixed wxSingleChoiceDialog to match the docs wrt the style flag
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-08 18:47:53 +00:00
Gilles Depeyrot
1d79bd3eaf corrected WXWIN_COMPATIBILITY conditional tests
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-07 11:23:24 +00:00
Vadim Zeitlin
1e6feb95a7 first pass of wxUniv merge - nothing works, most parts don't even compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 20:59:19 +00:00
Václav Slavík
2adaf5969f implemented wxGetSingleChoiceIndex version that takes wxArrayString
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-22 22:03:40 +00:00
Vadim Zeitlin
e93bfe3c74 patch initializing the multi choice dialog with the selections array values
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-12 21:54:39 +00:00
George Tasker
54b8489125 Fixed a problem in ConvertWXArrayToC() that would assign a string to an incorrect memory location due to missing parens "(*choices)[i] = aChoices[i];"
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-05 19:10:04 +00:00
Vadim Zeitlin
b41ec29ad2 added missing function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-11-11 16:12:09 +00:00