no real changes, just renamed the header guard to standard form and removed unneeded casts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -9,8 +9,8 @@
|
|||||||
// Licence: wxWindows licence
|
// Licence: wxWindows licence
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#ifndef __CHOICEDLGH_G__
|
#ifndef _WX_GENERIC_CHOICDGG_H_
|
||||||
#define __CHOICEDLGH_G__
|
#define _WX_GENERIC_CHOICDGG_H_
|
||||||
|
|
||||||
#include "wx/dynarray.h"
|
#include "wx/dynarray.h"
|
||||||
#include "wx/dialog.h"
|
#include "wx/dialog.h"
|
||||||
@@ -230,7 +230,7 @@ private:
|
|||||||
WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
|
WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
|
||||||
const wxString& caption,
|
const wxString& caption,
|
||||||
const wxArrayString& choices,
|
const wxArrayString& choices,
|
||||||
wxWindow *parent = (wxWindow *) NULL,
|
wxWindow *parent = NULL,
|
||||||
int x = wxDefaultCoord,
|
int x = wxDefaultCoord,
|
||||||
int y = wxDefaultCoord,
|
int y = wxDefaultCoord,
|
||||||
bool centre = true,
|
bool centre = true,
|
||||||
@@ -240,7 +240,7 @@ WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
|
|||||||
WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
|
WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
|
||||||
const wxString& caption,
|
const wxString& caption,
|
||||||
int n, const wxString *choices,
|
int n, const wxString *choices,
|
||||||
wxWindow *parent = (wxWindow *) NULL,
|
wxWindow *parent = NULL,
|
||||||
int x = wxDefaultCoord,
|
int x = wxDefaultCoord,
|
||||||
int y = wxDefaultCoord,
|
int y = wxDefaultCoord,
|
||||||
bool centre = true,
|
bool centre = true,
|
||||||
@@ -252,7 +252,7 @@ WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
|
|||||||
WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message,
|
WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message,
|
||||||
const wxString& caption,
|
const wxString& caption,
|
||||||
const wxArrayString& choices,
|
const wxArrayString& choices,
|
||||||
wxWindow *parent = (wxWindow *) NULL,
|
wxWindow *parent = NULL,
|
||||||
int x = wxDefaultCoord,
|
int x = wxDefaultCoord,
|
||||||
int y = wxDefaultCoord,
|
int y = wxDefaultCoord,
|
||||||
bool centre = true,
|
bool centre = true,
|
||||||
@@ -262,7 +262,7 @@ WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message,
|
|||||||
WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message,
|
WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message,
|
||||||
const wxString& caption,
|
const wxString& caption,
|
||||||
int n, const wxString *choices,
|
int n, const wxString *choices,
|
||||||
wxWindow *parent = (wxWindow *) NULL,
|
wxWindow *parent = NULL,
|
||||||
int x = wxDefaultCoord,
|
int x = wxDefaultCoord,
|
||||||
int y = wxDefaultCoord,
|
int y = wxDefaultCoord,
|
||||||
bool centre = true,
|
bool centre = true,
|
||||||
@@ -274,7 +274,7 @@ WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message,
|
|||||||
const wxString& caption,
|
const wxString& caption,
|
||||||
const wxArrayString& choices,
|
const wxArrayString& choices,
|
||||||
void **client_data,
|
void **client_data,
|
||||||
wxWindow *parent = (wxWindow *) NULL,
|
wxWindow *parent = NULL,
|
||||||
int x = wxDefaultCoord,
|
int x = wxDefaultCoord,
|
||||||
int y = wxDefaultCoord,
|
int y = wxDefaultCoord,
|
||||||
bool centre = true,
|
bool centre = true,
|
||||||
@@ -285,7 +285,7 @@ WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message,
|
|||||||
const wxString& caption,
|
const wxString& caption,
|
||||||
int n, const wxString *choices,
|
int n, const wxString *choices,
|
||||||
void **client_data,
|
void **client_data,
|
||||||
wxWindow *parent = (wxWindow *) NULL,
|
wxWindow *parent = NULL,
|
||||||
int x = wxDefaultCoord,
|
int x = wxDefaultCoord,
|
||||||
int y = wxDefaultCoord,
|
int y = wxDefaultCoord,
|
||||||
bool centre = true,
|
bool centre = true,
|
||||||
@@ -299,7 +299,7 @@ WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections,
|
|||||||
const wxString& message,
|
const wxString& message,
|
||||||
const wxString& caption,
|
const wxString& caption,
|
||||||
int n, const wxString *choices,
|
int n, const wxString *choices,
|
||||||
wxWindow *parent = (wxWindow *) NULL,
|
wxWindow *parent = NULL,
|
||||||
int x = wxDefaultCoord,
|
int x = wxDefaultCoord,
|
||||||
int y = wxDefaultCoord,
|
int y = wxDefaultCoord,
|
||||||
bool centre = true,
|
bool centre = true,
|
||||||
@@ -310,11 +310,11 @@ WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections,
|
|||||||
const wxString& message,
|
const wxString& message,
|
||||||
const wxString& caption,
|
const wxString& caption,
|
||||||
const wxArrayString& choices,
|
const wxArrayString& choices,
|
||||||
wxWindow *parent = (wxWindow *) NULL,
|
wxWindow *parent = NULL,
|
||||||
int x = wxDefaultCoord,
|
int x = wxDefaultCoord,
|
||||||
int y = wxDefaultCoord,
|
int y = wxDefaultCoord,
|
||||||
bool centre = true,
|
bool centre = true,
|
||||||
int width = wxCHOICE_WIDTH,
|
int width = wxCHOICE_WIDTH,
|
||||||
int height = wxCHOICE_HEIGHT);
|
int height = wxCHOICE_HEIGHT);
|
||||||
|
|
||||||
#endif // __CHOICEDLGH_G__
|
#endif // _WX_GENERIC_CHOICDGG_H_
|
||||||
|
Reference in New Issue
Block a user