1. stderr redirection seems to work under Windows too (documented new
wxProcess method too) 2. don't show the window of the (console) process in wxExecute if IO is redirected 3. implemented wxColourDialog::SetTitle 4. implemented wxGauge95::SetForeground/BackgroundColour() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: colordlg.h
|
||||
// Name: wx/msw/colordlg.h
|
||||
// Purpose: wxColourDialog class
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
// Created: 01/02/97
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_COLORDLG_H_
|
||||
@@ -20,25 +20,31 @@
|
||||
#include "wx/dialog.h"
|
||||
#include "wx/cmndata.h"
|
||||
|
||||
/*
|
||||
* COLOUR DIALOG
|
||||
*/
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxColourDialog: dialog for choosing a colours
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxColourDialog: public wxDialog
|
||||
class WXDLLEXPORT wxColourDialog : public wxDialog
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxColourDialog)
|
||||
public:
|
||||
wxColourDialog(void);
|
||||
wxColourDialog();
|
||||
wxColourDialog(wxWindow *parent, wxColourData *data = NULL);
|
||||
|
||||
bool Create(wxWindow *parent, wxColourData *data = NULL);
|
||||
|
||||
int ShowModal(void);
|
||||
wxColourData& GetColourData(void) { return m_colourData; }
|
||||
wxColourData& GetColourData() { return m_colourData; }
|
||||
|
||||
// override some base class virtuals
|
||||
virtual void SetTitle(const wxString& title);
|
||||
virtual wxString GetTitle();
|
||||
virtual int ShowModal();
|
||||
|
||||
protected:
|
||||
wxColourData m_colourData;
|
||||
wxWindow* m_dialogParent;
|
||||
wxString m_title;
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxColourDialog)
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@@ -148,7 +148,13 @@ WXDLLEXPORT long wxExecute(const wxString& command, bool sync = FALSE,
|
||||
wxProcess *process = (wxProcess *) NULL);
|
||||
|
||||
// execute the command capturing its output into an array line by line
|
||||
WXDLLEXPORT long wxExecute(const wxString& command, wxArrayString& output);
|
||||
WXDLLEXPORT long wxExecute(const wxString& command,
|
||||
wxArrayString& output);
|
||||
|
||||
// also capture stderr
|
||||
WXDLLEXPORT long wxExecute(const wxString& command,
|
||||
wxArrayString& output,
|
||||
wxArrayString& error);
|
||||
|
||||
enum wxSignal
|
||||
{
|
||||
|
Reference in New Issue
Block a user