DoSetClientSize omissions fixed; some doc fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/ftp.tex b/docs/latex/wx/ftp.tex
index 039bb10cd127b504b66f5b37e822c816a400a006..99c7f490a883839682019838c57447d9d3b8cc22 100644 (file)
--- a/docs/latex/wx/ftp.tex
+++ b/docs/latex/wx/ftp.tex
@@ -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}
+

diff --git a/docs/latex/wx/http.tex b/docs/latex/wx/http.tex
index 1171472e755c2929a4b84c790e6463b6bc0187d2..509f27b02b1ad90e5ac17a29657151ae0ea71816 100644 (file)
--- a/docs/latex/wx/http.tex
+++ b/docs/latex/wx/http.tex
@@ -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.
+

diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h
index 732b4917c3ded25d004c5fb9c5a25fbf40ccfe68..4c9372f4d91224c24f9ca837dcbc8f93a8432966 100644 (file)
--- a/include/wx/motif/frame.h
+++ b/include/wx/motif/frame.h
@@ -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); }
 

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index e5bd76e8cb73d33125a88833860d8c609dfbccea..c156d77e1c21e458bb551b141dd932422f8e2092 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -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;
 

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index ed28cd8448a5c410194e3ae6f77559a4ccc38afb..a0e3ae67fcb2ce68a5d9be6fe12f36a79daad8b3 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -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);

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index e68427dbd2b0bd497b3d469e565514281ad0c5d0..49c48a65d2a766ce74dba27326e94013e48a085f 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -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;

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index f993328a52f9fbbad18aa2e0422224d0759379c0..3709ab01494d3417284170922401c19403e0f165 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -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);