*** empty log message ***
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -43,11 +43,16 @@ private:
|
|||||||
DECLARE_EVENT_TABLE()
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
||||||
#if !defined( __WXMSW__ ) && !defined( __WXMAC__)
|
#if !defined( __WXMSW__ ) && !defined( __WXMAC__) && !defined(__WXPM__)
|
||||||
#define wxMessageDialog wxGenericMessageDialog
|
#define wxMessageDialog wxGenericMessageDialog
|
||||||
|
|
||||||
int wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr,
|
int wxMessageBox( const wxString& message
|
||||||
long style = wxOK|wxCENTRE, wxWindow *parent = (wxWindow *) NULL, int x = -1, int y = -1);
|
,const wxString& caption = wxMessageBoxCaptionStr
|
||||||
|
,long style = wxOK|wxCENTRE
|
||||||
|
,wxWindow *parent = (wxWindow *) NULL
|
||||||
|
,int x = -1
|
||||||
|
,int y = -1
|
||||||
|
);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@@ -45,6 +45,7 @@
|
|||||||
#include "wx/dcprint.h"
|
#include "wx/dcprint.h"
|
||||||
#include "wx/printdlg.h"
|
#include "wx/printdlg.h"
|
||||||
#include "wx/generic/prntdlgg.h"
|
#include "wx/generic/prntdlgg.h"
|
||||||
|
#include "wx/generic/progdlgg.h"
|
||||||
#include "wx/paper.h"
|
#include "wx/paper.h"
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
@@ -371,7 +371,7 @@ void wxPropertyValue::Copy(wxPropertyValue& copyFrom)
|
|||||||
case wxPropertyValueStringPtr:
|
case wxPropertyValueStringPtr:
|
||||||
{
|
{
|
||||||
wxChar** s = copyFrom.StringValuePtr();
|
wxChar** s = copyFrom.StringValuePtr();
|
||||||
(*this) = s != 0;
|
(*this) = s;
|
||||||
return ;
|
return ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user