Some doc fixes

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

diff --git a/docs/latex/wx/bmpdatob.tex b/docs/latex/wx/bmpdatob.tex
index 3c7038a8435e866f98e9a83a3d8eace24a41c4bc..3d89e2648bc5f3316ed211552d2179d0efbed652 100644 (file)
--- a/docs/latex/wx/bmpdatob.tex
+++ b/docs/latex/wx/bmpdatob.tex
@@ -36,7 +36,7 @@ efficiency.
 Constructor, optionally passing a bitmap (otherwise use 
 \helpref{SetBitmap}{wxbitmapdataobjectsetbitmap} later)
 
-\membersection{wxBitmapDataObject::GetBitmap}\label{wxbitmapdataobjectgettext}
+\membersection{wxBitmapDataObject::GetBitmap}\label{wxbitmapdataobjectgetbitmap}
 
 \constfunc{virtual wxBitmap}{GetBitmap}{\void}
 

diff --git a/docs/latex/wx/droptrgt.tex b/docs/latex/wx/droptrgt.tex
index c4db2ec7c3f3d2ed8ef05c0d12fe60269478b54a..30e206c4e7c92b54e954814e0989383da117fdcd 100644 (file)
--- a/docs/latex/wx/droptrgt.tex
+++ b/docs/latex/wx/droptrgt.tex
@@ -43,11 +43,15 @@ Override this to indicate how many formats you support.
 
 Override this to indicate what kind of data you support.
 
-\membersection{wxDropTarget::OnEnter}\label{wxdroptargetonenter}
+\membersection{wxDropTarget::OnData}\label{wxdroptargetondata}
 
-\func{virtual void}{OnEnter}{\void}
+\func{virtual wxDragResult}{OnData}{\param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{wxDragResult}{ def}}
 
-Called when the mouse enters the drop target.
+Called after OnDrop() returns TRUE: you will usually just call
+GetData() from here and, probably, also refresh something to update the
+new data and, finally, return the code indicating how did the operation
+complete (returning default value in case of success and wxDragError on
+failure is usually ok).
 
 \membersection{wxDropTarget::OnDrop}\label{wxdroptargetondrop}
 
@@ -69,6 +73,12 @@ Called when the user drops a data object on the target. Return FALSE to veto the
 
 Return TRUE to accept the data, FALSE to veto the operation.
 
+\membersection{wxDropTarget::OnEnter}\label{wxdroptargetonenter}
+
+\func{virtual void}{OnEnter}{\void}
+
+Called when the mouse enters the drop target.
+
 \membersection{wxDropTarget::OnLeave}\label{wxdroptargetonleave}
 
 \func{virtual void}{OnLeave}{\void}

diff --git a/docs/latex/wx/filesysh.tex b/docs/latex/wx/filesysh.tex
index 03d37300becf53b1c72aae2403fcc3edf082be3b..4444ef92717229fda19a864013c1b147f509a54b 100644 (file)
--- a/docs/latex/wx/filesysh.tex
+++ b/docs/latex/wx/filesysh.tex
@@ -102,7 +102,7 @@ Returns the right location string extracted from {\it location}.
 
 Example : GetRightLocation("file:myzipfile.zip\#zip:index.htm") == "index.htm"
 
-\membersection{wxFileSystemHandler::FindFirst}\label{wxfilesystemfindfirst}
+\membersection{wxFileSystemHandler::FindFirst}\label{wxfilesystemhandlerfindfirst}
 
 \func{virtual wxString}{FindFirst}{\param{const wxString\& }{wildcard}, \param{int }{flags = 0}}
 
@@ -112,7 +112,7 @@ wxFILE (only files), wxDIR (only directories) or 0 (both).
 
 This method is only called if \helpref{CanOpen}{wxfilesystemhandlercanopen} returns TRUE.
 
-\membersection{wxFileSystemHandler::FindNext}\label{wxfilesystemfindnext}
+\membersection{wxFileSystemHandler::FindNext}\label{wxfilesystemhandlerfindnext}
 
 \func{virtual wxString}{FindNext}{\void}
 

diff --git a/docs/latex/wx/socket.tex b/docs/latex/wx/socket.tex
index 9d27c9e945c69bb5c7092b9a8f814b35054acdc9..bcc46c9218ce373da3f30565a0119497d263a49d 100644 (file)
--- a/docs/latex/wx/socket.tex
+++ b/docs/latex/wx/socket.tex
@@ -721,7 +721,7 @@ void SocketCallback(wxSocketBase& sock,wxSocketNotify evt,char *cdata);
 
 The first parameter is a reference to the socket object in which the event
 occured. The second parameter tells you which event occured. (See \helpref{wxSocket events}{wxsocketbase}).
-The third parameter is the user data you specified using \helpref{CallbackData}{wxsocketcallbackdata}.
+The third parameter is the user data you specified using \helpref{CallbackData}{wxsocketbasecallbackdata}.
 
 \wxheading{Return value}
 
@@ -948,7 +948,7 @@ Destroys a wxSocketServer object (it doesn't close the accepted connections).
 %
 % Accept
 %
-\membersection{wxSocketServer::Accept}
+\membersection{wxSocketServer::Accept}\label{wxsocketserveraccept}
 
 \func{wxSocketBase *}{Accept}{\param{bool}{ wait = TRUE}}
 
@@ -973,7 +973,7 @@ connections.
 
 \wxheading{See also}
 
-\helpref{wxSocketServer::WaitForAccept}{wxsocketbasewaitforaccept}, 
+\helpref{wxSocketServer::WaitForAccept}{wxsocketserverwaitforaccept}, 
 \helpref{wxSocketBase::SetNotify}{wxsocketbasesetnotify}, 
 \helpref{wxSocketBase::Notify}{wxsocketbasenotify}, 
 \helpref{wxSocketServer::AcceptWith}{wxsocketserveracceptwith}
@@ -998,7 +998,7 @@ Returns TRUE on success, or FALSE if an error occured or if the
 {\it wait} parameter was FALSE and there were no pending
 connections.
 
-\helpref{wxSocketServer::WaitForAccept}{wxsocketbasewaitforaccept}, 
+\helpref{wxSocketServer::WaitForAccept}{wxsocketserverwaitforaccept}, 
 \helpref{wxSocketBase::SetNotify}{wxsocketbasesetnotify}, 
 \helpref{wxSocketBase::Notify}{wxsocketbasenotify}, 
 \helpref{wxSocketServer::Accept}{wxsocketserveraccept}

diff --git a/docs/latex/wx/wx.hpj b/docs/latex/wx/wx.hpj
index 43d8c3717649f8f6647d6c78559db5dcd8778168..5bf567ae88d787ec44eb4b000f61a6857265055a 100644 (file)
--- a/docs/latex/wx/wx.hpj
+++ b/docs/latex/wx/wx.hpj
@@ -1,5 +1,5 @@
 [OPTIONS]
-BMROOT=d:\wx2\wxWindows\docs\latex\wx ; Assume that bitmaps are where the source is
+BMROOT=d:\wx2\wxWind~1\docs/latex/wx ; Assume that bitmaps are where the source is
 TITLE=wxWindows Manual
 CONTENTS=Contents
 COMPRESS=HIGH