1. wxWizard appears in the centre of the screen by default
2. the selected brush isn't damaged any more by DrawBitmap() 3. corrected confusion between current and bg brush in DrawBitmap() 4. added wxGetColourFromUser() (to match wxGetTextFromUser() &c) 5. mem leak/crash in wxListCtrl on mode change fixed 6. wxListCtrl::Set{Fore|Back}groundColour() work as expected now git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -59,6 +59,10 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if wxUSE_GUI
|
||||
#include "wx/colordlg.h"
|
||||
#endif // wxUSE_GUI
|
||||
|
||||
#include <time.h>
|
||||
|
||||
#ifndef __MWERKS__
|
||||
@@ -908,6 +912,30 @@ wxString wxGetPasswordFromUser(const wxString& message,
|
||||
|
||||
#endif // wxUSE_TEXTDLG
|
||||
|
||||
wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit)
|
||||
{
|
||||
wxColourData data;
|
||||
data.SetChooseFull(TRUE);
|
||||
if ( colInit.Ok() )
|
||||
{
|
||||
data.SetColour((wxColour &)colInit); // const_cast
|
||||
}
|
||||
|
||||
wxColour colRet;
|
||||
wxColourDialog dialog(parent, &data);
|
||||
if ( dialog.ShowModal() == wxID_OK )
|
||||
{
|
||||
colRet = dialog.GetColourData().GetColour();
|
||||
}
|
||||
//else: leave it invalid
|
||||
|
||||
return colRet;
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// missing C RTL functions (FIXME shouldn't be here at all)
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#ifdef __MWERKS__
|
||||
char *strdup(const char *s)
|
||||
{
|
||||
|
Reference in New Issue
Block a user