[Wxlua-commit] wxLua/modules/wxluadebug/include splttree.h,1.3,1.4 staktree.h,1.4,1.5 wxldebug.h,1.3,1.4

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21610/wxLua/modules/wxluadebug/include

Modified Files:
	splttree.h staktree.h wxldebug.h 
Log Message:
Makefile - lib order is important
cleanup in lconsole, wxlua app
all static int s_wxXXX lua tags now s_wxluatag_wxXXX to make them easier to find
functions to get the structs with the bindings are prepended with wxLuaXXX
DECLARE/IMPLEMENT_CLASS replaced with either XXX_ABSTRACT/DYNAMIC_CLASS
window ids for the stacktree now ID_WXLUA_XXX


Index: staktree.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/staktree.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** staktree.h	25 Nov 2005 02:43:02 -0000	1.4
--- staktree.h	29 Nov 2005 05:45:10 -0000	1.5
***************
*** 24,27 ****
--- 24,41 ----
  
  // ----------------------------------------------------------------------------
+ // constants
+ // ----------------------------------------------------------------------------
+ 
+ #define ID_WXLUA_STACKFRAME                 2000
+ #define ID_WXLUA_STACKFRAME_COMBO           2001
+ #define ID_WXLUA_STACKFRAME_SCRWIN          2002
+ #define ID_WXLUA_STACKFRAME_SPLITWIN        2003
+ #define ID_WXLUA_STACKFRAME_STACKTREE       2004
+ #define ID_WXLUA_STACKFRAME_VALUE_SPLITWIN  2005
+ #define ID_WXLUA_STACKFRAME_VALUE_WIN1      2006
+ #define ID_WXLUA_STACKFRAME_VALUE_WIN2      2007
+ #define ID_WXLUA_STACKFRAME_DISMISS_BUTTON  2008
+ 
+ // ----------------------------------------------------------------------------
  // wxLuaStackFrame
  // ----------------------------------------------------------------------------
***************
*** 75,116 ****
      int                         m_nCurrentSel;
  
-     DECLARE_EVENT_TABLE()
- 
  private:
- 
      friend class wxLuaStackDataWindow;
  };
  
  // ----------------------------------------------------------------------------
- // constants
- // ----------------------------------------------------------------------------
- 
- #define idSTACK_FRAME             2000
- #define idSTACK_COMBOBOX          2001
- #define idSCROLLED_WINDOW         2002
- #define idSPLITTER_WINDOW         2003
- #define idSTACKTREE_CTRL          2004
- #define idVALUE_SPLITTER_WINDOW   2005
- #define idFIRST_VALUE_WINDOW      2006
- #define idSECOND_VALUE_WINDOW     2007
- #define idDISMISS_BUTTON          2008
- 
- // ----------------------------------------------------------------------------
  // wxLuaStackTree
  // ----------------------------------------------------------------------------
  
! class wxLuaStackTree : public wxRemotelyScrolledTreeCtrl
  {
-     DECLARE_CLASS(wxLuaStackTree)
  public:
      wxLuaStackTree( wxWindow      *parent,
!                     wxWindowID     id,
                      const wxPoint &pt    = wxDefaultPosition,
                      const wxSize  &sz    = wxDefaultSize,
                      long           style = wxTR_HAS_BUTTONS);
      virtual ~wxLuaStackTree();
  
  private:
      wxImageList*    m_imageList;
      DECLARE_EVENT_TABLE()
  };
--- 89,116 ----
      int                         m_nCurrentSel;
  
  private:
      friend class wxLuaStackDataWindow;
+     DECLARE_ABSTRACT_CLASS(wxLuaStackFrame)
+     DECLARE_EVENT_TABLE()
  };
  
  // ----------------------------------------------------------------------------
  // wxLuaStackTree
  // ----------------------------------------------------------------------------
  
! class WXDLLIMPEXP_WXLUA wxLuaStackTree : public wxRemotelyScrolledTreeCtrl
  {
  public:
      wxLuaStackTree( wxWindow      *parent,
!                     wxWindowID     id    = wxID_ANY,
                      const wxPoint &pt    = wxDefaultPosition,
                      const wxSize  &sz    = wxDefaultSize,
                      long           style = wxTR_HAS_BUTTONS);
+ 
      virtual ~wxLuaStackTree();
  
  private:
      wxImageList*    m_imageList;
+     DECLARE_ABSTRACT_CLASS(wxLuaStackTree)
      DECLARE_EVENT_TABLE()
  };
***************
*** 119,123 ****
  // wxLuaStackDataWindow
  // ----------------------------------------------------------------------------
! class wxLuaStackDataWindow : public wxTreeCompanionWindow
  {
  public:
--- 119,124 ----
  // wxLuaStackDataWindow
  // ----------------------------------------------------------------------------
! 
! class WXDLLIMPEXP_WXLUA wxLuaStackDataWindow : public wxTreeCompanionWindow
  {
  public:
***************
*** 134,137 ****
--- 135,139 ----
  private:
      bool    m_fFirst;
+     DECLARE_ABSTRACT_CLASS(wxLuaStackDataWindow)
      DECLARE_EVENT_TABLE()
  };

Index: wxldebug.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxldebug.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxldebug.h	26 Nov 2005 08:46:57 -0000	1.3
--- wxldebug.h	29 Nov 2005 05:45:10 -0000	1.4
***************
*** 52,56 ****
      wxString m_fileName;
      wxString m_buffer;
!     DECLARE_CLASS(wxLuaBuffer)
  };
  
--- 52,56 ----
      wxString m_fileName;
      wxString m_buffer;
!     DECLARE_ABSTRACT_CLASS(wxLuaBuffer)
  };
  
***************
*** 235,239 ****
  
  private:
!     DECLARE_CLASS(wxLuaDebuggerBase)
  };
  
--- 235,239 ----
  
  private:
!     DECLARE_ABSTRACT_CLASS(wxLuaDebuggerBase)
  };
  

Index: splttree.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/splttree.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** splttree.h	25 Nov 2005 02:43:02 -0000	1.3
--- splttree.h	29 Nov 2005 05:45:10 -0000	1.4
***************
*** 45,49 ****
                                 const wxSize  &sz = wxDefaultSize,
                                 long           style = wxTR_HAS_BUTTONS);
!     ~wxRemotelyScrolledTreeCtrl();
  
  //// Events
--- 45,49 ----
                                 const wxSize  &sz = wxDefaultSize,
                                 long           style = wxTR_HAS_BUTTONS);
!     virtual ~wxRemotelyScrolledTreeCtrl();
  
  //// Events
***************
*** 117,121 ****
      }
  
-     DECLARE_EVENT_TABLE()
  protected:
      wxWindow     *m_firstCompanionWindow;
--- 117,120 ----
***************
*** 123,128 ****
      bool          m_drawRowLines;
      wxTreeItemId &m_lastTreeItemId;
  private:
!     DECLARE_CLASS(wxRemotelyScrolledTreeCtrl)
  };
  
--- 122,129 ----
      bool          m_drawRowLines;
      wxTreeItemId &m_lastTreeItemId;
+ 
  private:
!     DECLARE_ABSTRACT_CLASS(wxRemotelyScrolledTreeCtrl)
!     DECLARE_EVENT_TABLE()
  };
  
***************
*** 136,148 ****
  {
  public:
-     DECLARE_CLASS(wxTreeCompanionWindow)
- 
      wxTreeCompanionWindow(wxWindow*      parent,
!                           wxWindowID     id    = -1,
                            const wxPoint& pos   = wxDefaultPosition,
                            const wxSize&  sz    = wxDefaultSize,
                            long           style = 0);
  
!     ~wxTreeCompanionWindow();
  
  //// Overrides
--- 137,147 ----
  {
  public:
      wxTreeCompanionWindow(wxWindow*      parent,
!                           wxWindowID     id    = wxID_ANY,
                            const wxPoint& pos   = wxDefaultPosition,
                            const wxSize&  sz    = wxDefaultSize,
                            long           style = 0);
  
!     virtual ~wxTreeCompanionWindow();
  
  //// Overrides
***************
*** 155,160 ****
      void OnSelChanged(wxTreeEvent& event);
  
- //// Operations
- 
  //// Accessors
      wxRemotelyScrolledTreeCtrl* GetTreeCtrl() const
--- 154,157 ----
***************
*** 172,175 ****
--- 169,174 ----
      wxRemotelyScrolledTreeCtrl *m_treeControl;
  
+ private:
+     DECLARE_ABSTRACT_CLASS(wxTreeCompanionWindow)
      DECLARE_EVENT_TABLE()
  };
***************
*** 186,193 ****
  {
  public:
-     DECLARE_DYNAMIC_CLASS(wxThinSplitterWindow)
- 
      wxThinSplitterWindow(wxWindow*      parent,
!                          wxWindowID     id    = -1,
                           const wxPoint& pos   = wxDefaultPosition,
                           const wxSize&  sz    = wxDefaultSize,
--- 185,190 ----
  {
  public:
      wxThinSplitterWindow(wxWindow*      parent,
!                          wxWindowID     id    = wxID_ANY,
                           const wxPoint& pos   = wxDefaultPosition,
                           const wxSize&  sz    = wxDefaultSize,
***************
*** 206,215 ****
      void OnSize(wxSizeEvent& event);
  
- //// Operations
- 
- //// Accessors
- 
- //// Data members
  protected:
      DECLARE_EVENT_TABLE()
  };
--- 203,208 ----
      void OnSize(wxSizeEvent& event);
  
  protected:
+     DECLARE_ABSTRACT_CLASS(wxThinSplitterWindow)
      DECLARE_EVENT_TABLE()
  };
***************
*** 224,240 ****
   */
  
! class wxSplitterScrolledWindow: public wxScrolledWindow
  {
  public:
-     DECLARE_DYNAMIC_CLASS(wxSplitterScrolledWindow)
- 
      wxSplitterScrolledWindow(wxWindow*      parent,
!                              wxWindowID     id    = -1,
                               const wxPoint &pos   = wxDefaultPosition,
                               const wxSize  &sz    = wxDefaultSize,
                               long           style = 0);
  
- //// Overrides
- 
  //// Events
  
--- 217,229 ----
   */
  
! class WXDLLIMPEXP_WXLUA wxSplitterScrolledWindow: public wxScrolledWindow
  {
  public:
      wxSplitterScrolledWindow(wxWindow*      parent,
!                              wxWindowID     id    = wxID_ANY,
                               const wxPoint &pos   = wxDefaultPosition,
                               const wxSize  &sz    = wxDefaultSize,
                               long           style = 0);
  
  //// Events
  
***************
*** 242,254 ****
      void OnSize(wxSizeEvent& event);
  
! //// Operations
! 
! //// Accessors
! 
! //// Data members
! public:
      DECLARE_EVENT_TABLE()
  };
  
! #endif
!         // _SPLITTREE_H_
--- 231,238 ----
      void OnSize(wxSizeEvent& event);
  
! private:
!     DECLARE_ABSTRACT_CLASS(wxSplitterScrolledWindow)
      DECLARE_EVENT_TABLE()
  };
  
! #endif // _SPLITTREE_H_