Some corrections

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

diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat
index a351b9cc620f22c665706aeaad8aa7e807cd524a..318903d3018b4ac5d65091e4a0e03c05f257ae98 100755 (executable)
--- a/distrib/msw/zipdist.bat
+++ b/distrib/msw/zipdist.bat
@@ -67,9 +67,6 @@ rem zip32 -@ %dest\glcanvas.zip < %src\distrib\msw\glcanvas.rsp
 rem Tex2RTF
 zip32 -@ %dest\tex2rtf2.zip < %src\distrib\msw\tex2rtf.rsp
 
 rem Tex2RTF
 zip32 -@ %dest\tex2rtf2.zip < %src\distrib\msw\tex2rtf.rsp
 

-rem wxTreeLayout
-zip32 -@ %dest\treedraw.zip < %src\distrib\msw\wxtree.rsp
-

 rem JPEG source
 zip32 -@ %dest\jpeg.zip < %src\distrib\msw\jpeg.rsp
 
 rem JPEG source
 zip32 -@ %dest\jpeg.zip < %src\distrib\msw\jpeg.rsp
 


@@ -106,7 +103,6 @@ unzip32 -o ..\wx%version%_bc.zip
 unzip32 -o ..\wx%version%_hlp.zip
 Rem Need Word file, for Remstar DB classes
 unzip32 -o ..\wx%version%_wrd.zip
 unzip32 -o ..\wx%version%_hlp.zip
 Rem Need Word file, for Remstar DB classes
 unzip32 -o ..\wx%version%_wrd.zip

-unzip32 -o ..\treedraw.zip

 unzip32 -o ..\ogl3.zip
 unzip32 -o ..\jpeg.zip
 unzip32 -o ..\tiff.zip
 unzip32 -o ..\ogl3.zip
 unzip32 -o ..\jpeg.zip
 unzip32 -o ..\tiff.zip

diff --git a/docs/latex/wx/sndaiff.tex b/docs/latex/wx/sndaiff.tex
index 71142a72f86f91af10e526df8c95101a48599f59..fc909dd23a1a8e4d96e29cf59112e6ae8df0a3af 100644 (file)
--- a/docs/latex/wx/sndaiff.tex
+++ b/docs/latex/wx/sndaiff.tex
@@ -20,12 +20,8 @@ AIFF codec
 
 \func{}{wxSoundAiff}{\param{wxInputStream\& }{stream}, \param{wxSoundStream\& }{io\_sound}}
 
 
 \func{}{wxSoundAiff}{\param{wxInputStream\& }{stream}, \param{wxSoundStream\& }{io\_sound}}
 

-
-\membersection{wxSoundAiff::wxSoundAiff}\label{wxsoundaiffwxsoundaiff}
-

 \func{}{wxSoundAiff}{\param{wxOutputStream\& }{stream}, \param{wxSoundStream\& }{io\_sound}}
 
 \func{}{wxSoundAiff}{\param{wxOutputStream\& }{stream}, \param{wxSoundStream\& }{io\_sound}}
 

-

 \membersection{wxSoundAiff::\destruct{wxSoundAiff}}\label{wxsoundaiffdtor}
 
 \func{}{\destruct{wxSoundAiff}}{\void}
 \membersection{wxSoundAiff::\destruct{wxSoundAiff}}\label{wxsoundaiffdtor}
 
 \func{}{\destruct{wxSoundAiff}}{\void}

diff --git a/docs/latex/wx/sndbase.tex b/docs/latex/wx/sndbase.tex
index e5ecbc002869c2b7cf87cfd18c80ec6a36f07e1f..492cc9ba3da710004f7ab4482f624a16a887a9db 100644 (file)
--- a/docs/latex/wx/sndbase.tex
+++ b/docs/latex/wx/sndbase.tex
@@ -26,7 +26,7 @@ No base class
 %% wxSoundStream errors
 %%
 
 %% wxSoundStream errors
 %%
 

-\wxheading{wxSoundStream errors}\label{wxsoundstreamerrors}
+\wxheading{wxSoundStream errors}

 
 \twocolwidtha{7cm}
 \begin{twocollist}\itemsep=0pt
 
 \twocolwidtha{7cm}
 \begin{twocollist}\itemsep=0pt


@@ -64,13 +64,13 @@ processor (which can be inherited) or call a C function. Its definition is:
 
 The {\bf stream} parameter represents the current wxSoundStream.
 
 
 The {\bf stream} parameter represents the current wxSoundStream.
 

-The {\bf evt} parameter represents the sound event which is the cause of the calling. (See \helpref{wxSound events}{wxsoundstreamevents}).
+The {\bf evt} parameter represents the sound event which is the cause of the calling. (See \helpref{wxSound events}{wxsoundstream}).

 
 The {\bf cdata} parameter represents the user callback data which were specified
 when the user called \helpref{wxSoundStream::Register}{wxsoundstreamregister}.
 
 {\it Note:} There are two other ways to catch sound events: you can inherit the
 
 The {\bf cdata} parameter represents the user callback data which were specified
 when the user called \helpref{wxSoundStream::Register}{wxsoundstreamregister}.
 
 {\it Note:} There are two other ways to catch sound events: you can inherit the

-sound stream and redefine \helpref{wxSoundStream::OnSoundEvent}{wxsoundstreamonsoundevent}, or you can reroute the events to another sound stream using \helpref{wxSoundStream::SetEventHandler}{wxsoundstreameventhandler}.
+sound stream and redefine \helpref{wxSoundStream::OnSoundEvent}{wxsoundstreamonsoundevent}, or you can reroute the events to another sound stream using \helpref{wxSoundStream::SetEventHandler}{wxsoundstreamseteventhandler}.

 
 %%
 %% wxSoundStream streaming mode
 
 %%
 %% wxSoundStream streaming mode


@@ -206,7 +206,7 @@ current sound stream (it can be a sound file or a sound driver).
 Then, either it manages to apply it and it returns {\bf TRUE}, or it could not and
 it returns {\bf FALSE}. In this case, you must check the error with
 \helpref{wxSoundStream::GetError}{wxsoundstreamgeterror}. See 
 Then, either it manages to apply it and it returns {\bf TRUE}, or it could not and
 it returns {\bf FALSE}. In this case, you must check the error with
 \helpref{wxSoundStream::GetError}{wxsoundstreamgeterror}. See 

-\helpref{wxSoundStream errors section}{wxsoundstreamerrors} for more details.
+\helpref{wxSoundStream errors section}{wxsoundstream} for more details.

 
 \wxheading{Remark}
 
 
 \wxheading{Remark}
 

diff --git a/docs/latex/wx/sndfile.tex b/docs/latex/wx/sndfile.tex
index b3e6557b4a1ad81f1ebdfdbe33b9fe6d03713f2d..348b696c3eddeff4e294d1a9a9c11eeb686d8a00 100644 (file)
--- a/docs/latex/wx/sndfile.tex
+++ b/docs/latex/wx/sndfile.tex
@@ -22,12 +22,8 @@ Base class for file coders/decoders
 
 \func{}{wxSoundFileStream}{\param{wxInputStream\& }{stream}, \param{wxSoundStream\& }{io\_sound}}
 
 
 \func{}{wxSoundFileStream}{\param{wxInputStream\& }{stream}, \param{wxSoundStream\& }{io\_sound}}
 

-
-\membersection{wxSoundFileStream::wxSoundFileStream}\label{wxsoundfilestreamwxsoundfilestream}
-

 \func{}{wxSoundFileStream}{\param{wxOutputStream\& }{stream}, \param{wxSoundStream\& }{io\_sound}}
 
 \func{}{wxSoundFileStream}{\param{wxOutputStream\& }{stream}, \param{wxSoundStream\& }{io\_sound}}
 

-

 \membersection{wxSoundFileStream::\destruct{wxSoundFileStream}}\label{wxsoundfilestreamdtor}
 
 \func{}{\destruct{wxSoundFileStream}}{\void}
 \membersection{wxSoundFileStream::\destruct{wxSoundFileStream}}\label{wxsoundfilestreamdtor}
 
 \func{}{\destruct{wxSoundFileStream}}{\void}

diff --git a/docs/latex/wx/sndfpcm.tex b/docs/latex/wx/sndfpcm.tex
index 79b3a6b8b604fd6f4e56062b065ced10e0f015a3..9c14d08a9e0ab51995ac2a6fe8d9908c0f0bf4e3 100644 (file)
--- a/docs/latex/wx/sndfpcm.tex
+++ b/docs/latex/wx/sndfpcm.tex
@@ -73,7 +73,7 @@ PCM specification class
 \constfunc{int}{GetOrder}{\void}
 
 
 \constfunc{int}{GetOrder}{\void}
 
 

-\membersection{wxSoundFormatPcm::Signed}\label{wxsoundformatpcmsigned}
+\membersection{wxSoundFormatPcm::Signed}\label{wxsoundformatpcmgetsigned}

 
 \constfunc{bool}{Signed}{\void}
 
 
 \constfunc{bool}{Signed}{\void}
 

diff --git a/docs/latex/wx/sndwave.tex b/docs/latex/wx/sndwave.tex
index bec648771f465c131d0f321da599c5ae91bdf3bb..f3c72f0b4e55331771c3b8b7437a8f3ac113c6a0 100644 (file)
--- a/docs/latex/wx/sndwave.tex
+++ b/docs/latex/wx/sndwave.tex
@@ -22,9 +22,6 @@ WAVE codec
 
 \func{}{wxSoundWave}{\param{wxInputStream\& }{stream}, \param{wxSoundStream\& }{io\_sound}}
 
 
 \func{}{wxSoundWave}{\param{wxInputStream\& }{stream}, \param{wxSoundStream\& }{io\_sound}}
 

-
-\membersection{wxSoundWave::wxSoundWave}\label{wxsoundwavewxsoundwave}
-

 \func{}{wxSoundWave}{\param{wxOutputStream\& }{stream}, \param{wxSoundStream\& }{io\_sound}}
 
 
 \func{}{wxSoundWave}{\param{wxOutputStream\& }{stream}, \param{wxSoundStream\& }{io\_sound}}
 
 

diff --git a/docs/latex/wx/treelay.tex b/docs/latex/wx/treelay.tex
index 4b6bda45f03491a097abaf22890d1422c17a88b9..0594f8c7970fb829fa95f51b4b5ae7381f4ff986 100644 (file)
--- a/docs/latex/wx/treelay.tex
+++ b/docs/latex/wx/treelay.tex
@@ -14,7 +14,7 @@ and \helpref{wxTreeLayout::GetNodeParent}{wxtreelayoutgetnodeparent} functions.
 
 The application should call \helpref{wxTreeLayout::DoLayout}{wxtreelayoutdolayout} to do the tree
 layout. Depending on how the derived class has been defined, either
 
 The application should call \helpref{wxTreeLayout::DoLayout}{wxtreelayoutdolayout} to do the tree
 layout. Depending on how the derived class has been defined, either

-\rtfsp\helprefn{wxTreeLayout::Draw}{wxtreelayoutdraw} must be called (for example by the OnPaint member
+\rtfsp\helpref{wxTreeLayout::Draw}{wxtreelayoutdraw} must be called (for example by the OnPaint member

 of a wxScrolledWindow) or the application-defined drawing code should be called
 as normal.
 
 of a wxScrolledWindow) or the application-defined drawing code should be called
 as normal.
 


@@ -45,7 +45,7 @@ wxObject
 
 \wxheading{See also}
 
 
 \wxheading{See also}
 

-\helpref{wxLayoutTreeStored}{wxlayouttreestored}
+\helpref{wxTreeLayoutStored}{wxtreelayoutstored}

 
 \latexignore{\rtfignore{\wxheading{Members}}}
 
 
 \latexignore{\rtfignore{\wxheading{Members}}}
 


@@ -60,7 +60,7 @@ Constructor.
 \func{void}{ActivateNode}{\param{long}{ id}, \param{bool }{active}}
 
 Define this so wxTreeLayout can turn nodes on and off for drawing purposes
 \func{void}{ActivateNode}{\param{long}{ id}, \param{bool }{active}}
 
 Define this so wxTreeLayout can turn nodes on and off for drawing purposes

-(not all nodes may be connected in the tree). See also \helprefn{NodeActive}{nodeactive}.
+(not all nodes may be connected in the tree). See also \helpref{wxTreeLayout::NodeActive}{wxtreelayoutnodeactive}.

 
 \membersection{wxTreeLayout::CalcLayout}
 
 
 \membersection{wxTreeLayout::CalcLayout}
 


@@ -79,7 +79,7 @@ Calculates the layout for the tree, optionally specifying the top node.
 \func{void}{Draw}{\param{wxDC\&}{ dc}}
 
 Call this to let wxTreeLayout draw the tree itself, once the layout has been
 \func{void}{Draw}{\param{wxDC\&}{ dc}}
 
 Call this to let wxTreeLayout draw the tree itself, once the layout has been

-calculated with \helprefn{DoLayout}{dolayout}.
+calculated with \helpref{wxTreeLayout::DoLayout}{wxtreelayoutdolayout}.

 
 \membersection{wxTreeLayout::DrawBranch}
 
 
 \membersection{wxTreeLayout::DrawBranch}
 


@@ -161,7 +161,7 @@ may be necessary for your application.
 
 \constfunc{long}{GetLeftMargin}{\void}
 
 
 \constfunc{long}{GetLeftMargin}{\void}
 

-Gets the left margin set with \helprefn{SetMargins}{setmargins}.
+Gets the left margin set with \helpref{wxTreeLayout::SetMargins}{wxtreelayoutsetmargins}.

 
 \membersection{wxTreeLayout::GetOrientation}
 
 
 \membersection{wxTreeLayout::GetOrientation}
 


@@ -173,14 +173,14 @@ Gets the orientation: TRUE means top-to-bottom, FALSE means left-to-right (the d
 
 \constfunc{long}{GetTopMargin}{\void}
 
 
 \constfunc{long}{GetTopMargin}{\void}
 

-Gets the top margin set with \helprefn{SetMargins}{setmargins}.
+Gets the top margin set with \helpref{wxTreeLayout::SetMargins}{wxtreelayoutsetmargins}.

 
 \membersection{wxTreeLayout::GetTopNode}
 
 \constfunc{long}{GetTopNode}{\void}
 
 wxTreeLayout calls this to get the top of the tree. Don't redefine this; call
 
 \membersection{wxTreeLayout::GetTopNode}
 
 \constfunc{long}{GetTopNode}{\void}
 
 wxTreeLayout calls this to get the top of the tree. Don't redefine this; call

-\rtfsp\helprefn{SetTopNode}{settopnode} instead before calling \helprefn{DoLayout}{dolayout}.
+\rtfsp\helpref{wxTreeLayout::SetTopNode}{wxtreelayoutsettopnode} instead before calling \helpref{wxTreeLayout::DoLayout}{wxtreelayoutdolayout}.

 
 \membersection{wxTreeLayout::GetXSpacing}
 
 
 \membersection{wxTreeLayout::GetXSpacing}
 


@@ -206,7 +206,7 @@ or constructor.
 \func{bool}{NodeActive}{\param{long}{ id}}
 
 Define this so wxTreeLayout can know which nodes are to be drawn (not all
 \func{bool}{NodeActive}{\param{long}{ id}}
 
 Define this so wxTreeLayout can know which nodes are to be drawn (not all

-nodes may be connected in the tree). See also \helprefn{ActivateNode}{activatenode}.
+nodes may be connected in the tree). See also \helpref{wxTreeLayout::ActivateNode}{wxtreelayoutactivatenode}.

 
 \membersection{wxTreeLayout::SetNodeName}
 
 
 \membersection{wxTreeLayout::SetNodeName}
 


@@ -254,9 +254,9 @@ Sets the horizontal and vertical spacing between nodes in the tree.
 
 Sets the left and top margins of the whole tree.
 
 
 Sets the left and top margins of the whole tree.
 

-\section{\class{wxLayoutTreeStored}}\label{wxlayouttreestored}
+\section{\class{wxTreeLayoutStored}}\label{wxtreelayoutstored}

 
 

-wxLayoutTreeStored provides storage for node labels, position and client data. It also provides hit-testing
+wxTreeLayoutStored provides storage for node labels, position and client data. It also provides hit-testing

 (which node a mouse event occurred on). It is usually a more convenient class to use than wxTreeLayout.
 
 \wxheading{Derived from}
 (which node a mouse event occurred on). It is usually a more convenient class to use than wxTreeLayout.
 
 \wxheading{Derived from}


@@ -266,60 +266,60 @@ wxLayoutTreeStored provides storage for node labels, position and client data. I
 
 \wxheading{See also}
 
 
 \wxheading{See also}
 

-\helpref{wxLayoutTree}{wxlayouttree}
+\helpref{wxTreeLayout}{wxtreelayout}

 
 \latexignore{\rtfignore{\wxheading{Members}}}
 
 
 \latexignore{\rtfignore{\wxheading{Members}}}
 

-\membersection{wxLayoutTreeStored::wxLayoutTreeStored}
+\membersection{wxTreeLayoutStored::wxTreeLayoutStored}

 
 

-\func{}{wxLayoutTreeStored}{\param{int }{noNodes = 200}}
+\func{}{wxTreeLayoutStored}{\param{int }{noNodes = 200}}

 
 Constructor. Specify the maximum number of nodes to be allocated.
 
 
 Constructor. Specify the maximum number of nodes to be allocated.
 

-\membersection{wxLayoutTreeStored::AddChild}\label{wxlayouttreestoredaddchild}
+\membersection{wxTreeLayoutStored::AddChild}\label{wxtreelayoutstoredaddchild}

 
 \func{long}{AddChild}{\param{const wxString\&}{ name}, \param{const wxString\&}{ parent = ""}}
 
 Adds a child with a given parent, returning the node id.
 
 
 \func{long}{AddChild}{\param{const wxString\&}{ name}, \param{const wxString\&}{ parent = ""}}
 
 Adds a child with a given parent, returning the node id.
 

-\membersection{wxLayoutTreeStored::GetClientData}\label{wxlayouttreestoredgetclientdata}
+\membersection{wxTreeLayoutStored::GetClientData}\label{wxtreelayoutstoredgetclientdata}

 
 \constfunc{long}{GetClientData}{\param{long}{ id}}
 
 Gets the client data for the given node.
 
 
 \constfunc{long}{GetClientData}{\param{long}{ id}}
 
 Gets the client data for the given node.
 

-\membersection{wxLayoutTreeStored::GetNode}\label{wxlayouttreestoredgetnode}
+\membersection{wxTreeLayoutStored::GetNode}\label{wxtreelayoutstoredgetnode}

 
 \constfunc{wxStoredNode*}{GetNode}{\param{long}{ id}}
 
 Returns the wxStoredNode object for the given node id.
 
 
 \constfunc{wxStoredNode*}{GetNode}{\param{long}{ id}}
 
 Returns the wxStoredNode object for the given node id.
 

-\membersection{wxLayoutTreeStored::GetNodeCount}\label{wxlayouttreestoredgetnodecount}
+\membersection{wxTreeLayoutStored::GetNodeCount}\label{wxtreelayoutstoredgetnodecount}

 
 \constfunc{int}{GetNodeCount}{\void}
 
 Returns the current number of nodes.
 
 
 \constfunc{int}{GetNodeCount}{\void}
 
 Returns the current number of nodes.
 

-\membersection{wxLayoutTreeStored::GetNumNodes}\label{wxlayouttreestoredgetnumnodes}
+\membersection{wxTreeLayoutStored::GetNumNodes}\label{wxtreelayoutstoredgetnumnodes}

 
 \constfunc{int}{GetNumNodes}{\void}
 
 Returns the maximum number of nodes.
 
 
 \constfunc{int}{GetNumNodes}{\void}
 
 Returns the maximum number of nodes.
 

-\membersection{wxLayoutTreeStored::HitTest}\label{wxlayouttreestoredhittest}
+\membersection{wxTreeLayoutStored::HitTest}\label{wxtreelayoutstoredhittest}

 
 \func{wxString}{HitTest}{\param{wxMouseEvent\&}{ event}, \param{wxDC\& }{dc}}
 
 Returns a string with the node name corresponding to the position of the mouse event, or the empty string if no node
 was detected.
 
 
 \func{wxString}{HitTest}{\param{wxMouseEvent\&}{ event}, \param{wxDC\& }{dc}}
 
 Returns a string with the node name corresponding to the position of the mouse event, or the empty string if no node
 was detected.
 

-\membersection{wxLayoutTreeStored::NameToId}\label{wxlayouttreestorednametoid}
+\membersection{wxTreeLayoutStored::NameToId}\label{wxtreelayoutstorednametoid}

 
 \func{long}{NameToId}{\param{const wxString\&}{ name}}
 
 Returns the id for the given node name, or -1 if there was no such node.
 
 
 \func{long}{NameToId}{\param{const wxString\&}{ name}}
 
 Returns the id for the given node name, or -1 if there was no such node.
 

-\membersection{wxLayoutTreeStored::SetClientData}\label{wxlayouttreestoredsetclientdata}
+\membersection{wxTreeLayoutStored::SetClientData}\label{wxtreelayoutstoredsetclientdata}

 
 \func{void}{SetClientData}{\param{long}{ id}, \param{long}{ clientData}}
 
 
 \func{void}{SetClientData}{\param{long}{ id}, \param{long}{ clientData}}
 

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]
 [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
 TITLE=wxWindows Manual
 CONTENTS=Contents
 COMPRESS=HIGH

diff --git a/include/wx/generic/treelay.h b/include/wx/generic/treelay.h
index c6c5185c03df86db2a24168640e4e98c4cd5efdf..f4a90e808ec41f7c6eb594e34199e771db0dcb3e 100644 (file)
--- a/include/wx/generic/treelay.h
+++ b/include/wx/generic/treelay.h
@@ -93,12 +93,12 @@ public:
  * A version of wxTreeLayout with storage for nodes
  */
 
  * A version of wxTreeLayout with storage for nodes
  */
 

-class WXDLLEXPORT wxLayoutTreeStored: public wxTreeLayout
+class WXDLLEXPORT wxTreeLayoutStored: public wxTreeLayout

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxLayoutTreeStored)
+    DECLARE_DYNAMIC_CLASS(wxTreeLayoutStored)

 public:
 public:

-    wxLayoutTreeStored(int noNodes = 200);
-    ~wxLayoutTreeStored(void);
+    wxTreeLayoutStored(int noNodes = 200);
+    ~wxTreeLayoutStored(void);

     void Initialize(int n);
     
     wxString HitTest(wxMouseEvent& event, wxDC& dc);
     void Initialize(int n);
     
     wxString HitTest(wxMouseEvent& event, wxDC& dc);


@@ -131,7 +131,7 @@ private:
 };
 
 // For backward compatibility
 };
 
 // For backward compatibility

-#define wxStoredTree wxLayoutTreeStored
+#define wxStoredTree wxTreeLayoutStored

 
 #endif
  // _WX_TREELAY_H_
 
 #endif
  // _WX_TREELAY_H_

diff --git a/samples/treelay/test.cpp b/samples/treelay/test.cpp
index 1434cf2d5c47b0af54a7fc954e683305d8132d61..52b3797b1cf9176af94705dcdb4ed6724189a0e7 100644 (file)
--- a/samples/treelay/test.cpp
+++ b/samples/treelay/test.cpp
@@ -24,7 +24,7 @@
 
 #include "test.h"
 
 
 #include "test.h"
 

-wxStoredTree *myTree = NULL;
+wxTreeLayoutStored *myTree = NULL;

 
 // A macro needed for some compilers (AIX) that need 'main' to be defined
 // in the application itself.
 
 // A macro needed for some compilers (AIX) that need 'main' to be defined
 // in the application itself.


@@ -70,7 +70,7 @@ bool MyApp::OnInit()
   canvas->SetScrollbars(20, 20, 50, 50);
   frame->canvas = canvas;
 
   canvas->SetScrollbars(20, 20, 50, 50);
   frame->canvas = canvas;
 

-  myTree = new wxStoredTree();
+  myTree = new wxTreeLayoutStored();

 
   wxClientDC dc(canvas);
   wxFont font(10, wxROMAN, wxNORMAL, wxBOLD);
 
   wxClientDC dc(canvas);
   wxFont font(10, wxROMAN, wxNORMAL, wxBOLD);


@@ -85,7 +85,7 @@ bool MyApp::OnInit()
   return TRUE;
 }
 
   return TRUE;
 }
 

-void MyApp::TreeTest(wxStoredTree& tree, wxDC& dc)
+void MyApp::TreeTest(wxTreeLayoutStored& tree, wxDC& dc)

 {
   tree.Initialize(200);
   
 {
   tree.Initialize(200);
   

diff --git a/samples/treelay/test.h b/samples/treelay/test.h
index b00660744e050831aeacaf976fd6b3894bd77b97..8167a8fc8d8677b21e823bc784c5d2b2b3da4e07 100644 (file)
--- a/samples/treelay/test.h
+++ b/samples/treelay/test.h
@@ -14,7 +14,7 @@ class MyApp: public wxApp
 {
   public:
     bool OnInit();
 {
   public:
     bool OnInit();

-    void TreeTest(wxStoredTree& tree, wxDC& dc);
+    void TreeTest(wxTreeLayoutStored& tree, wxDC& dc);

 };
 
 DECLARE_APP(MyApp)
 };
 
 DECLARE_APP(MyApp)

diff --git a/src/generic/treelay.cpp b/src/generic/treelay.cpp
index 35496a9d7dd2bd48582591f9a61282d9613ff58d..f75f8137443004028e5943aac35bb436c16d6d68 100644 (file)
--- a/src/generic/treelay.cpp
+++ b/src/generic/treelay.cpp
@@ -245,22 +245,22 @@ void wxTreeLayout::CalcLayout(long nodeId, int level, wxDC& dc)
  *
  */
 
  *
  */
 

-IMPLEMENT_DYNAMIC_CLASS(wxLayoutTreeStored, wxTreeLayout)
+IMPLEMENT_DYNAMIC_CLASS(wxTreeLayoutStored, wxTreeLayout)

 
 

-wxLayoutTreeStored::wxLayoutTreeStored(int n):wxTreeLayout()
+wxTreeLayoutStored::wxTreeLayoutStored(int n):wxTreeLayout()

 {
     m_nodes = NULL;
     m_maxNodes = 0;
     Initialize(n);
 }
 
 {
     m_nodes = NULL;
     m_maxNodes = 0;
     Initialize(n);
 }
 

-wxLayoutTreeStored::~wxLayoutTreeStored(void)
+wxTreeLayoutStored::~wxTreeLayoutStored(void)

 {
     if (m_nodes)
         delete[] m_nodes;
 }
 
 {
     if (m_nodes)
         delete[] m_nodes;
 }
 

-void wxLayoutTreeStored::Initialize(int n)
+void wxTreeLayoutStored::Initialize(int n)

 {
     m_maxNodes = n;
     wxTreeLayout::Initialize();
 {
     m_maxNodes = n;
     wxTreeLayout::Initialize();


@@ -278,7 +278,7 @@ void wxLayoutTreeStored::Initialize(int n)
     m_num = 0;
 }
 
     m_num = 0;
 }
 

-long wxLayoutTreeStored::AddChild(const wxString& name, const wxString& parent)
+long wxTreeLayoutStored::AddChild(const wxString& name, const wxString& parent)

 {
     if (m_num < (m_maxNodes -1 ))
     {
 {
     if (m_num < (m_maxNodes -1 ))
     {


@@ -299,7 +299,7 @@ long wxLayoutTreeStored::AddChild(const wxString& name, const wxString& parent)
         return -1;
 }
 
         return -1;
 }
 

-long wxLayoutTreeStored::NameToId(const wxString& name)
+long wxTreeLayoutStored::NameToId(const wxString& name)

 {
     long i;
     for (i = 0; i < m_num; i++)
 {
     long i;
     for (i = 0; i < m_num; i++)


@@ -308,7 +308,7 @@ long wxLayoutTreeStored::NameToId(const wxString& name)
         return -1;
 }
 
         return -1;
 }
 

-void wxLayoutTreeStored::GetChildren(long id, wxList& list)
+void wxTreeLayoutStored::GetChildren(long id, wxList& list)

 {
     long currentId = GetTopNode();
     while (currentId != -1)
 {
     long currentId = GetTopNode();
     while (currentId != -1)


@@ -319,56 +319,56 @@ void wxLayoutTreeStored::GetChildren(long id, wxList& list)
     }
 }
 
     }
 }
 

-wxStoredNode* wxLayoutTreeStored::GetNode(long idx) const
+wxStoredNode* wxTreeLayoutStored::GetNode(long idx) const

 {
     wxASSERT(idx < m_num);
     
     return &m_nodes[idx];
 };
 
 {
     wxASSERT(idx < m_num);
     
     return &m_nodes[idx];
 };
 

-long wxLayoutTreeStored::GetNodeX(long id)
+long wxTreeLayoutStored::GetNodeX(long id)

 {
     wxASSERT(id < m_num);
     
     return (long)m_nodes[id].m_x;
 }
 
 {
     wxASSERT(id < m_num);
     
     return (long)m_nodes[id].m_x;
 }
 

-long wxLayoutTreeStored::GetNodeY(long id)
+long wxTreeLayoutStored::GetNodeY(long id)

 {
     wxASSERT(id < m_num);
     
     return (long)m_nodes[id].m_y;
 }
 
 {
     wxASSERT(id < m_num);
     
     return (long)m_nodes[id].m_y;
 }
 

-void wxLayoutTreeStored::SetNodeX(long id, long x)
+void wxTreeLayoutStored::SetNodeX(long id, long x)

 {
     wxASSERT(id < m_num);
     
     m_nodes[id].m_x = (int)x;
 }
 
 {
     wxASSERT(id < m_num);
     
     m_nodes[id].m_x = (int)x;
 }
 

-void wxLayoutTreeStored::SetNodeY(long id, long y)
+void wxTreeLayoutStored::SetNodeY(long id, long y)

 {
     wxASSERT(id < m_num);
     
     m_nodes[id].m_y = (int)y;
 }
 
 {
     wxASSERT(id < m_num);
     
     m_nodes[id].m_y = (int)y;
 }
 

-void wxLayoutTreeStored::SetNodeName(long id, const wxString& name)
+void wxTreeLayoutStored::SetNodeName(long id, const wxString& name)

 {
     wxASSERT(id < m_num);
     
     m_nodes[id].m_name = name;
 }
 
 {
     wxASSERT(id < m_num);
     
     m_nodes[id].m_name = name;
 }
 

-wxString wxLayoutTreeStored::GetNodeName(long id)
+wxString wxTreeLayoutStored::GetNodeName(long id)

 {
     wxASSERT(id < m_num);
     
     return m_nodes[id].m_name;
 }
 
 {
     wxASSERT(id < m_num);
     
     return m_nodes[id].m_name;
 }
 

-long wxLayoutTreeStored::GetNodeParent(long id)
+long wxTreeLayoutStored::GetNodeParent(long id)

 {
     if (id != -1)
     {
 {
     if (id != -1)
     {


@@ -380,7 +380,7 @@ long wxLayoutTreeStored::GetNodeParent(long id)
         return -1;
 }
 
         return -1;
 }
 

-long wxLayoutTreeStored::GetNextNode(long id)
+long wxTreeLayoutStored::GetNextNode(long id)

 {
     wxASSERT(id < m_num);
     
 {
     wxASSERT(id < m_num);
     


@@ -390,35 +390,35 @@ long wxLayoutTreeStored::GetNextNode(long id)
         return -1;
 }
 
         return -1;
 }
 

-void wxLayoutTreeStored::SetClientData(long id, long clientData)
+void wxTreeLayoutStored::SetClientData(long id, long clientData)

 {
     wxASSERT(id < m_num);
     
     m_nodes[id].m_clientData = clientData;
 }
 
 {
     wxASSERT(id < m_num);
     
     m_nodes[id].m_clientData = clientData;
 }
 

-long wxLayoutTreeStored::GetClientData(long id) const
+long wxTreeLayoutStored::GetClientData(long id) const

 {
     wxASSERT(id < m_num);
     
     return m_nodes[id].m_clientData;
 }
 
 {
     wxASSERT(id < m_num);
     
     return m_nodes[id].m_clientData;
 }
 

-void wxLayoutTreeStored::ActivateNode(long id, bool active)
+void wxTreeLayoutStored::ActivateNode(long id, bool active)

 {
     wxASSERT(id < m_num);
     
     m_nodes[id].m_active = active;
 }
 
 {
     wxASSERT(id < m_num);
     
     m_nodes[id].m_active = active;
 }
 

-bool wxLayoutTreeStored::NodeActive(long id)
+bool wxTreeLayoutStored::NodeActive(long id)

 {
     wxASSERT(id < m_num);
     
     return m_nodes[id].m_active;
 }
 
 {
     wxASSERT(id < m_num);
     
     return m_nodes[id].m_active;
 }
 

-wxString wxLayoutTreeStored::HitTest(wxMouseEvent& event, wxDC& dc)
+wxString wxTreeLayoutStored::HitTest(wxMouseEvent& event, wxDC& dc)

 {
     wxPoint pt = event.GetPosition();
     wxCoord x = pt.x;
 {
     wxPoint pt = event.GetPosition();
     wxCoord x = pt.x;