Amebis/wxWidgets
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed (and documented) wxColourDialog::Create()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-06-28 11:12:40 +00:00
parent 0c3e16933d
commit 2bde25b093
3 changed files with 87 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/generic/colrdlgg.cpp
View File

@@ -121,8 +121,11 @@ wxGenericColourDialog::wxGenericColourDialog()
colourSelection = 0;
}
wxGenericColourDialog::wxGenericColourDialog(wxWindow *parent, wxColourData *data):
wxDialog(parent, -1, wxT("Colour"), wxPoint(0, 0), wxSize(900, 900), wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL)
wxGenericColourDialog::wxGenericColourDialog(wxWindow *parent,
wxColourData *data)
: wxDialog(parent, -1, wxT("Colour"),
wxPoint(0, 0), wxSize(900, 900),
wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL)
{
whichKind = 1;
colourSelection = 0;
@@ -140,16 +143,21 @@ void wxGenericColourDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data)
{
dialogParent = parent;
if ( !wxDialog::Create(parent, -1, wxT("Colour"),
wxPoint(0, 0), wxSize(900, 900),
wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL) )
return FALSE;
if (data)
colourData = *data;
dialogParent = parent;
InitializeColours();
CalculateMeasurements();
CreateWidgets();
if (data)
colourData = *data;
return TRUE;
InitializeColours();
CalculateMeasurements();
CreateWidgets();
return TRUE;
}
int wxGenericColourDialog::ShowModal()