[Wxlua-commit] wxLua/modules/wxluadebug/include wxldebug.h,1.1,1.2

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

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

Modified Files:
	wxldebug.h 
Log Message:
fix wxMessageDialog in dialogs.i, at least for 2.6
cleanup wxLuaObject to use a single int and enum to store allocation type
wxLuaState can now attach to lua_States or wxLuaStateRefData
wxLuaDebugEvent to use copy constructor for clone
enum debugCommands and debugEvents to wxLuaDebugCommands/Events_Type


Index: wxldebug.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxldebug.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxldebug.h	25 Nov 2005 19:45:36 -0000	1.1
--- wxldebug.h	26 Nov 2005 03:15:19 -0000	1.2
***************
*** 41,45 ****
  {
  public:
!     wxLuaBuffer(const wxString &fileName, const wxString &buffer);
  
      wxString GetBuffer() const { return m_buffer; }
--- 41,46 ----
  {
  public:
!     wxLuaBuffer(const wxString &fileName, const wxString &buffer)
!         : m_fileName(fileName), m_buffer(buffer) {}
  
      wxString GetBuffer() const { return m_buffer; }
***************
*** 55,59 ****
  
  #if wxCHECK_VERSION(2, 5, 0)
!     WX_DEFINE_ARRAY_PTR(wxLuaBuffer *, wxLuaBufferArray);
  #else
      WX_DEFINE_ARRAY(wxLuaBuffer *, wxLuaBufferArray);
--- 56,60 ----
  
  #if wxCHECK_VERSION(2, 5, 0)
!     WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxLuaBuffer *, wxLuaBufferArray, class WXDLLIMPEXP_WXLUA);
  #else
      WX_DEFINE_ARRAY(wxLuaBuffer *, wxLuaBufferArray);
***************
*** 108,112 ****
      virtual ~wxLuaDebugData();
  
!     wxLuaDebugData *Clone();
      static int SortFunction(wxLuaDebugDataItem *elem1, wxLuaDebugDataItem *elem2 );
  };
--- 109,113 ----
      virtual ~wxLuaDebugData();
  
!     wxLuaDebugData *Clone() const;
      static int SortFunction(wxLuaDebugDataItem *elem1, wxLuaDebugDataItem *elem2 );
  };
***************
*** 167,171 ****
  // ----------------------------------------------------------------------------
  
! enum debugEvents // FIXME prefix wxLUA on these
  {
      EVENT_DEBUG_BREAK,
--- 168,172 ----
  // ----------------------------------------------------------------------------
  
! enum wxLuaDebugEvents_Type
  {
      EVENT_DEBUG_BREAK,
***************
*** 185,189 ****
  // ----------------------------------------------------------------------------
  
! enum debugCommands // FIXME prefix wxLUA on these
  {
      CMD_ADD_BREAKPOINT,
--- 186,190 ----
  // ----------------------------------------------------------------------------
  
! enum wxLuaDebugCommands_Type
  {
      CMD_ADD_BREAKPOINT,
***************
*** 242,275 ****
  {
  public:
!     wxLuaDebugEvent();
!     wxLuaDebugEvent(int eventType);
!     wxLuaDebugEvent(int eventType,
!                     int lineNumber,
!                     const wxString &fileName,
                      bool enabledFlag = false);
  
      virtual ~wxLuaDebugEvent();
  
!     void               SetMessage(const wxString &message);
!     void               SetDebugData(int             nReference,
!                                     wxLuaDebugData *pDebugData = NULL);
  
-     int                   GetLineNumber() const;
-     wxString              GetFileName() const;
-     wxString              GetMessage() const;
-     int                   GetReference() const;
-     const wxLuaDebugData *GetDebugData() const;
-     bool                  GetEnabledFlag() const;
  protected:
!     virtual wxEvent* Clone() const;
  
! private:
!     bool         m_fHasMessage;
!     bool         m_fEnabledFlag;
!     int          m_lineNumber;
!     wxString     m_fileName;
!     wxString     m_strMessage;
!     int          m_nReference;
      wxLuaDebugData *m_pDebugData;
      DECLARE_DYNAMIC_CLASS(wxLuaDebugEvent)
  };
--- 243,276 ----
  {
  public:
!     wxLuaDebugEvent(const wxLuaDebugEvent& event);
!     wxLuaDebugEvent(int eventType = wxEVT_NULL, 
!                     int lineNumber = 0,
!                     const wxString &fileName = wxEmptyString, 
                      bool enabledFlag = false);
  
      virtual ~wxLuaDebugEvent();
  
!     void SetMessage(const wxString &message);
!     void SetDebugData(int nReference, wxLuaDebugData *pDebugData = NULL);
! 
!     int      GetLineNumber() const { return m_lineNumber;}
!     wxString GetFileName() const { return m_fileName; }
!     wxString GetMessage() const { return m_strMessage; }
!     int      GetReference() const { return m_nReference; }
!     bool     GetEnabledFlag() const { return m_fEnabledFlag; }
!     const wxLuaDebugData *GetDebugData() const { return m_pDebugData; }
  
  protected:
!     virtual wxEvent* Clone() const { return new wxLuaDebugEvent(*this); }
  
!     int      m_lineNumber;
!     wxString m_fileName;
!     wxString m_strMessage;
!     bool     m_fHasMessage;
!     int      m_nReference;
!     bool     m_fEnabledFlag;
      wxLuaDebugData *m_pDebugData;
+ 
+ private:
      DECLARE_DYNAMIC_CLASS(wxLuaDebugEvent)
  };