DoSetClientSize omissions fixed; some doc fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
585037876a
commit
721b32e058
@ -85,6 +85,7 @@ Delete the file specified by \it{path}. Returns TRUE if successful.
|
||||
% ----------------------------------------------------------------------------
|
||||
|
||||
\membersection{wxFTP::SetUser}
|
||||
|
||||
\func{void}{SetUser}{\param{const wxString\&}{ user}}
|
||||
|
||||
Sets the user name to be sent to the FTP server to be allowed to log in.
|
||||
@ -100,6 +101,7 @@ For example, you can use: "ftp://a_user:a_password@a.host:service/a_directory/a_
|
||||
to specify a user and a password.
|
||||
|
||||
\membersection{wxFTP::SetPassword}
|
||||
|
||||
\func{void}{SetPassword}{\param{const wxString\&}{ passwd}}
|
||||
|
||||
Sets the password to be sent to the FTP server to be allowed to log in.
|
||||
@ -113,12 +115,12 @@ user name and the host name of the local machine from the system.
|
||||
\wxheading{Remark}
|
||||
|
||||
This parameter can be included in a URL if you want to use the URL manager.
|
||||
For example, you can use: "ftp://a_user:a_password@a.host:service/a_directory/a_
|
||||
file"
|
||||
For example, you can use: "ftp://a\_user:a\_password@a.host:service/a_directory/a\_file"
|
||||
to specify a user and a password.
|
||||
|
||||
% ----------------------------------------------------------------------------
|
||||
\membersection{wxFTP::GetList}
|
||||
|
||||
\func{wxList *}{GetList}{\param{const wxString\&}{ wildcard}}
|
||||
|
||||
The GetList function is quite low-level. It returns the list of the files in
|
||||
@ -210,3 +212,4 @@ can send new commands without reconnecting.
|
||||
\wxheading{See also}
|
||||
|
||||
\helpref{wxInputStream}{wxinputstream}
|
||||
|
||||
|
@ -17,12 +17,12 @@
|
||||
% ----------------------------------------------------------------------------
|
||||
|
||||
% ----------------------------------------------------------------------------
|
||||
\membersection{wxHTTP::GetInputStream}\label{wxprotogetinput}
|
||||
\membersection{wxHTTP::GetInputStream}\label{wxhttpgetinputstream}
|
||||
|
||||
\func{wxInputStream *}{GetInputStream}{\param{const wxString\&}{ path}}
|
||||
|
||||
Creates a new input stream on the the specified path. You can use all but seek
|
||||
functionnality of wxStream. Seek isn't available on all stream. For example,
|
||||
Creates a new input stream on the the specified path. You can use all except the seek
|
||||
functionality of wxStream. Seek isn't available on all streams. For example,
|
||||
http or ftp streams doesn't deal with it. Other functions like StreamSize and
|
||||
Tell aren't available for the moment for this sort of stream.
|
||||
You will be notified when the EOF is reached by an error.
|
||||
@ -49,7 +49,9 @@ name is specified by \it{header} and the content by \it{h_data}.
|
||||
This is a low level function and it assumes that you know what you are doing.
|
||||
|
||||
\membersection{wxHTTP::SetHeader}
|
||||
|
||||
\func{wxString}{GetHeader}{\param{const wxString\&}{ header}}
|
||||
|
||||
Returns the data attached with a field whose name is specified by \it{header}.
|
||||
If the field doesn't exist, it will return an empty string and not a NULL string.
|
||||
|
||||
|
@ -59,6 +59,10 @@ public:
|
||||
void GetSize(int *width, int *height) const ;
|
||||
void GetPosition(int *x, int *y) const ;
|
||||
|
||||
wxSize GetSize() const { return wxWindow::GetSize(); }
|
||||
wxPoint GetPosition() const { return wxWindow::GetPosition(); }
|
||||
wxSize GetClientSize() const { return wxWindow::GetClientSize(); }
|
||||
|
||||
void ClientToScreen(int *x, int *y) const;
|
||||
wxPoint ClientToScreen(const wxPoint& pt) const { return wxWindow::ClientToScreen(pt); }
|
||||
|
||||
|
@ -62,7 +62,7 @@ public:
|
||||
|
||||
virtual bool Destroy();
|
||||
|
||||
virtual void SetClientSize(int width, int height);
|
||||
virtual void DoSetClientSize(int width, int height);
|
||||
|
||||
virtual void GetPosition(int *x, int *y) const;
|
||||
|
||||
|
@ -60,8 +60,12 @@ public:
|
||||
void GetSize(int *width, int *height) const ;
|
||||
void GetPosition(int *x, int *y) const ;
|
||||
|
||||
virtual void ClientToScreen(int *x, int *y) const;
|
||||
wxSize GetSize() const { return wxWindow::GetSize(); }
|
||||
wxPoint GetPosition() const { return wxWindow::GetPosition(); }
|
||||
wxSize GetClientSize() const { return wxWindow::GetClientSize(); }
|
||||
wxRect GetClientRect() const { return wxWindow::GetClientRect(); }
|
||||
|
||||
virtual void ClientToScreen(int *x, int *y) const;
|
||||
virtual void ScreenToClient(int *x, int *y) const;
|
||||
|
||||
void OnSize(wxSizeEvent& event);
|
||||
|
@ -248,7 +248,7 @@ bool wxDialog::IsIconized(void) const
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void wxDialog::SetClientSize(int width, int height)
|
||||
void wxDialog::DoSetClientSize(int width, int height)
|
||||
{
|
||||
HWND hWnd = (HWND) GetHWND();
|
||||
RECT rect;
|
||||
|
@ -711,7 +711,9 @@ void wxWindow::DoSetClientSize(int width, int height)
|
||||
{
|
||||
wxWindow *parent = GetParent();
|
||||
HWND hWnd = (HWND) GetHWND();
|
||||
HWND hParentWnd = (HWND) (HWND) parent->GetHWND();
|
||||
HWND hParentWnd = (HWND) 0;
|
||||
if (parent)
|
||||
hParentWnd = (HWND) parent->GetHWND();
|
||||
|
||||
RECT rect;
|
||||
::GetClientRect(hWnd, &rect);
|
||||
|
Loading…
Reference in New Issue
Block a user