wxDefaultSize.* and wxDefaultPosition.* to wxDefaultCoord.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -213,8 +213,8 @@ WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
|
||||
const wxString& caption,
|
||||
const wxArrayString& choices,
|
||||
wxWindow *parent = (wxWindow *) NULL,
|
||||
int x = wxDefaultPosition.x,
|
||||
int y = wxDefaultPosition.y,
|
||||
int x = wxDefaultCoord,
|
||||
int y = wxDefaultCoord,
|
||||
bool centre = true,
|
||||
int width = wxCHOICE_WIDTH,
|
||||
int height = wxCHOICE_HEIGHT);
|
||||
@@ -223,8 +223,8 @@ WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
|
||||
const wxString& caption,
|
||||
int n, const wxString *choices,
|
||||
wxWindow *parent = (wxWindow *) NULL,
|
||||
int x = wxDefaultPosition.x,
|
||||
int y = wxDefaultPosition.y,
|
||||
int x = wxDefaultCoord,
|
||||
int y = wxDefaultCoord,
|
||||
bool centre = true,
|
||||
int width = wxCHOICE_WIDTH,
|
||||
int height = wxCHOICE_HEIGHT);
|
||||
@@ -235,8 +235,8 @@ WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message,
|
||||
const wxString& caption,
|
||||
const wxArrayString& choices,
|
||||
wxWindow *parent = (wxWindow *) NULL,
|
||||
int x = wxDefaultPosition.x,
|
||||
int y = wxDefaultPosition.y,
|
||||
int x = wxDefaultCoord,
|
||||
int y = wxDefaultCoord,
|
||||
bool centre = true,
|
||||
int width = wxCHOICE_WIDTH,
|
||||
int height = wxCHOICE_HEIGHT);
|
||||
@@ -245,8 +245,8 @@ WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message,
|
||||
const wxString& caption,
|
||||
int n, const wxString *choices,
|
||||
wxWindow *parent = (wxWindow *) NULL,
|
||||
int x = wxDefaultPosition.x,
|
||||
int y = wxDefaultPosition.y,
|
||||
int x = wxDefaultCoord,
|
||||
int y = wxDefaultCoord,
|
||||
bool centre = true,
|
||||
int width = wxCHOICE_WIDTH,
|
||||
int height = wxCHOICE_HEIGHT);
|
||||
@@ -257,8 +257,8 @@ WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message,
|
||||
const wxArrayString& choices,
|
||||
void **client_data,
|
||||
wxWindow *parent = (wxWindow *) NULL,
|
||||
int x = wxDefaultPosition.x,
|
||||
int y = wxDefaultPosition.y,
|
||||
int x = wxDefaultCoord,
|
||||
int y = wxDefaultCoord,
|
||||
bool centre = true,
|
||||
int width = wxCHOICE_WIDTH,
|
||||
int height = wxCHOICE_HEIGHT);
|
||||
@@ -268,8 +268,8 @@ WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message,
|
||||
int n, const wxString *choices,
|
||||
void **client_data,
|
||||
wxWindow *parent = (wxWindow *) NULL,
|
||||
int x = wxDefaultPosition.x,
|
||||
int y = wxDefaultPosition.y,
|
||||
int x = wxDefaultCoord,
|
||||
int y = wxDefaultCoord,
|
||||
bool centre = true,
|
||||
int width = wxCHOICE_WIDTH,
|
||||
int height = wxCHOICE_HEIGHT);
|
||||
@@ -282,8 +282,8 @@ WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections,
|
||||
const wxString& caption,
|
||||
int n, const wxString *choices,
|
||||
wxWindow *parent = (wxWindow *) NULL,
|
||||
int x = wxDefaultPosition.x,
|
||||
int y = wxDefaultPosition.y,
|
||||
int x = wxDefaultCoord,
|
||||
int y = wxDefaultCoord,
|
||||
bool centre = true,
|
||||
int width = wxCHOICE_WIDTH,
|
||||
int height = wxCHOICE_HEIGHT);
|
||||
@@ -293,8 +293,8 @@ WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections,
|
||||
const wxString& caption,
|
||||
const wxArrayString& choices,
|
||||
wxWindow *parent = (wxWindow *) NULL,
|
||||
int x = wxDefaultPosition.x,
|
||||
int y = wxDefaultPosition.y,
|
||||
int x = wxDefaultCoord,
|
||||
int y = wxDefaultCoord,
|
||||
bool centre = true,
|
||||
int width = wxCHOICE_WIDTH,
|
||||
int height = wxCHOICE_HEIGHT);
|
||||
|
@@ -76,7 +76,7 @@ public:
|
||||
|
||||
bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
|
||||
wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY, bool useMask = false,
|
||||
wxCoord xsrcMask = wxDefaultPosition.x, wxCoord ysrcMask = wxDefaultPosition.y);
|
||||
wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
|
||||
bool CanDrawBitmap() const { return true; }
|
||||
|
||||
void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y );
|
||||
|
@@ -1533,7 +1533,7 @@ public:
|
||||
//
|
||||
|
||||
wxGrid( wxWindow *parent,
|
||||
int x, int y, int w = wxDefaultSize.x, int h = wxDefaultSize.y,
|
||||
int x, int y, int w = wxDefaultCoord, int h = wxDefaultCoord,
|
||||
long style = wxWANTS_CHARS,
|
||||
const wxString& name = wxPanelNameStr )
|
||||
: wxScrolledWindow( parent, wxID_ANY, wxPoint(x,y), wxSize(w,h),
|
||||
|
@@ -160,10 +160,10 @@ public:
|
||||
// no size hints
|
||||
virtual void SetSizeHints( int WXUNUSED(minW),
|
||||
int WXUNUSED(minH),
|
||||
int WXUNUSED(maxW) = wxDefaultSize.x,
|
||||
int WXUNUSED(maxH) = wxDefaultSize.y,
|
||||
int WXUNUSED(incW) = wxDefaultSize.x,
|
||||
int WXUNUSED(incH) = wxDefaultSize.y) {}
|
||||
int WXUNUSED(maxW) = wxDefaultCoord,
|
||||
int WXUNUSED(maxH) = wxDefaultCoord,
|
||||
int WXUNUSED(incW) = wxDefaultCoord,
|
||||
int WXUNUSED(incH) = wxDefaultCoord) {}
|
||||
|
||||
#if wxUSE_TOOLBAR
|
||||
// no toolbar bars
|
||||
|
@@ -78,8 +78,8 @@ wxGetTextFromUser(const wxString& message,
|
||||
const wxString& caption = wxGetTextFromUserPromptStr,
|
||||
const wxString& default_value = wxEmptyString,
|
||||
wxWindow *parent = (wxWindow *) NULL,
|
||||
int x = wxDefaultPosition.x,
|
||||
int y = wxDefaultPosition.y,
|
||||
int x = wxDefaultCoord,
|
||||
int y = wxDefaultCoord,
|
||||
bool centre = true);
|
||||
|
||||
wxString WXDLLEXPORT
|
||||
|
Reference in New Issue
Block a user