Skip to content

Commit

Permalink
Use Unix newlines for wxLua code.
Browse files Browse the repository at this point in the history
Since upstream wxLua uses Unix line endings, this allows us to more
easily merge updates from upstream. More broadly, we may want to
consider applying this across the entire repository and using the
recommended core.autocrlf option to convert to Windows file endings
locally as appropriate.

This commit has no functional changes.
  • Loading branch information
jpd236 committed Jan 2, 2020
1 parent 2b52c2f commit 0b3de8d
Show file tree
Hide file tree
Showing 112 changed files with 201,281 additions and 201,281 deletions.
418 changes: 209 additions & 209 deletions lua/wxbind/include/wxadv_bind.h

Large diffs are not rendered by default.

216 changes: 108 additions & 108 deletions lua/wxbind/include/wxadv_wxladv.h
Original file line number Diff line number Diff line change
@@ -1,108 +1,108 @@
/////////////////////////////////////////////////////////////////////////////
// Purpose: Wrappers around wxAdv classes for wxLua
// Author: J. Winwood
// Created: July 2002
// Copyright: (c) 2002 Lomtick Software. All rights reserved.
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////

#ifndef WX_LUA_WXLADV_H
#define WX_LUA_WXLADV_H

#include "wxbind/include/wxbinddefs.h"
#include "wxluasetup.h"

#if wxUSE_GRID && wxLUA_USE_wxGrid

#include "wx/grid.h"

class WXDLLIMPEXP_BINDWXADV wxLuaGridTableBase : public wxGridTableBase
{
public:
wxLuaGridTableBase(const wxLuaState& wxlState);
virtual ~wxLuaGridTableBase();

// You must override these functions in a derived table class
//
virtual int GetNumberRows();
virtual int GetNumberCols();
virtual bool IsEmptyCell( int row, int col );
virtual wxString GetValue( int row, int col );
virtual void SetValue( int row, int col, const wxString& value );

// Data type determination and value access
virtual wxString GetTypeName( int row, int col );
virtual bool CanGetValueAs( int row, int col, const wxString& typeName );
virtual bool CanSetValueAs( int row, int col, const wxString& typeName );

virtual long GetValueAsLong( int row, int col );
virtual double GetValueAsDouble( int row, int col );
virtual bool GetValueAsBool( int row, int col );

virtual void SetValueAsLong( int row, int col, long value );
virtual void SetValueAsDouble( int row, int col, double value );
virtual void SetValueAsBool( int row, int col, bool value );

// For user defined types
//virtual void* GetValueAsCustom( int row, int col, const wxString& typeName );
//virtual void SetValueAsCustom( int row, int col, const wxString& typeName, void* value );

// Overriding these is optional
//
//virtual void SetView( wxGrid *grid ) { m_view = grid; }
//virtual wxGrid * GetView() const { return m_view; }

virtual void Clear();
virtual bool InsertRows( size_t pos = 0, size_t numRows = 1 );
virtual bool AppendRows( size_t numRows = 1 );
virtual bool DeleteRows( size_t pos = 0, size_t numRows = 1 );
virtual bool InsertCols( size_t pos = 0, size_t numCols = 1 );
virtual bool AppendCols( size_t numCols = 1 );
virtual bool DeleteCols( size_t pos = 0, size_t numCols = 1 );

virtual wxString GetRowLabelValue( int row );
virtual wxString GetColLabelValue( int col );
virtual void SetRowLabelValue( int WXUNUSED(row), const wxString& );
virtual void SetColLabelValue( int WXUNUSED(col), const wxString& );

// Attribute handling
//

// give us the attr provider to use - we take ownership of the pointer
//void SetAttrProvider(wxGridCellAttrProvider *attrProvider);

// get the currently used attr provider (may be NULL)
//wxGridCellAttrProvider *GetAttrProvider() const { return m_attrProvider; }

// Does this table allow attributes? Default implementation creates
// a wxGridCellAttrProvider if necessary.
virtual bool CanHaveAttributes();

// by default forwarded to wxGridCellAttrProvider if any. May be
// overridden to handle attributes directly in the table.
virtual wxGridCellAttr *GetAttr( int row, int col,
wxGridCellAttr::wxAttrKind kind );


// these functions take ownership of the pointer
//virtual void SetAttr(wxGridCellAttr* attr, int row, int col);
//virtual void SetRowAttr(wxGridCellAttr *attr, int row);
//virtual void SetColAttr(wxGridCellAttr *attr, int col);

private:
wxLuaState m_wxlState;
DECLARE_ABSTRACT_CLASS(wxLuaGridTableBase)
};

// Template function to "delete" wxGridCellWorker and wxGridCellAttr classes
// since DecRef() should be called to delete them.
template <class T> void wxLua_wxGrid_DecRef_delete_function(void** p)
{
T* o = (T*)(*p);
o->DecRef();
}


#endif // wxUSE_GRID && wxLUA_USE_wxGrid

#endif // WX_LUA_WXLADV_H
/////////////////////////////////////////////////////////////////////////////
// Purpose: Wrappers around wxAdv classes for wxLua
// Author: J. Winwood
// Created: July 2002
// Copyright: (c) 2002 Lomtick Software. All rights reserved.
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////

#ifndef WX_LUA_WXLADV_H
#define WX_LUA_WXLADV_H

#include "wxbind/include/wxbinddefs.h"
#include "wxluasetup.h"

#if wxUSE_GRID && wxLUA_USE_wxGrid

#include "wx/grid.h"

class WXDLLIMPEXP_BINDWXADV wxLuaGridTableBase : public wxGridTableBase
{
public:
wxLuaGridTableBase(const wxLuaState& wxlState);
virtual ~wxLuaGridTableBase();

// You must override these functions in a derived table class
//
virtual int GetNumberRows();
virtual int GetNumberCols();
virtual bool IsEmptyCell( int row, int col );
virtual wxString GetValue( int row, int col );
virtual void SetValue( int row, int col, const wxString& value );

// Data type determination and value access
virtual wxString GetTypeName( int row, int col );
virtual bool CanGetValueAs( int row, int col, const wxString& typeName );
virtual bool CanSetValueAs( int row, int col, const wxString& typeName );

virtual long GetValueAsLong( int row, int col );
virtual double GetValueAsDouble( int row, int col );
virtual bool GetValueAsBool( int row, int col );

virtual void SetValueAsLong( int row, int col, long value );
virtual void SetValueAsDouble( int row, int col, double value );
virtual void SetValueAsBool( int row, int col, bool value );

// For user defined types
//virtual void* GetValueAsCustom( int row, int col, const wxString& typeName );
//virtual void SetValueAsCustom( int row, int col, const wxString& typeName, void* value );

// Overriding these is optional
//
//virtual void SetView( wxGrid *grid ) { m_view = grid; }
//virtual wxGrid * GetView() const { return m_view; }

virtual void Clear();
virtual bool InsertRows( size_t pos = 0, size_t numRows = 1 );
virtual bool AppendRows( size_t numRows = 1 );
virtual bool DeleteRows( size_t pos = 0, size_t numRows = 1 );
virtual bool InsertCols( size_t pos = 0, size_t numCols = 1 );
virtual bool AppendCols( size_t numCols = 1 );
virtual bool DeleteCols( size_t pos = 0, size_t numCols = 1 );

virtual wxString GetRowLabelValue( int row );
virtual wxString GetColLabelValue( int col );
virtual void SetRowLabelValue( int WXUNUSED(row), const wxString& );
virtual void SetColLabelValue( int WXUNUSED(col), const wxString& );

// Attribute handling
//

// give us the attr provider to use - we take ownership of the pointer
//void SetAttrProvider(wxGridCellAttrProvider *attrProvider);

// get the currently used attr provider (may be NULL)
//wxGridCellAttrProvider *GetAttrProvider() const { return m_attrProvider; }

// Does this table allow attributes? Default implementation creates
// a wxGridCellAttrProvider if necessary.
virtual bool CanHaveAttributes();

// by default forwarded to wxGridCellAttrProvider if any. May be
// overridden to handle attributes directly in the table.
virtual wxGridCellAttr *GetAttr( int row, int col,
wxGridCellAttr::wxAttrKind kind );


// these functions take ownership of the pointer
//virtual void SetAttr(wxGridCellAttr* attr, int row, int col);
//virtual void SetRowAttr(wxGridCellAttr *attr, int row);
//virtual void SetColAttr(wxGridCellAttr *attr, int col);

private:
wxLuaState m_wxlState;
DECLARE_ABSTRACT_CLASS(wxLuaGridTableBase)
};

// Template function to "delete" wxGridCellWorker and wxGridCellAttr classes
// since DecRef() should be called to delete them.
template <class T> void wxLua_wxGrid_DecRef_delete_function(void** p)
{
T* o = (T*)(*p);
o->DecRef();
}


#endif // wxUSE_GRID && wxLUA_USE_wxGrid

#endif // WX_LUA_WXLADV_H
176 changes: 88 additions & 88 deletions lua/wxbind/include/wxaui_bind.h
Original file line number Diff line number Diff line change
@@ -1,88 +1,88 @@
// ---------------------------------------------------------------------------
// wxaui.h - headers and wxLua types for wxLua binding
//
// This file was generated by genwxbind.lua
// Any changes made to this file will be lost when the file is regenerated
// ---------------------------------------------------------------------------

#ifndef __HOOK_WXLUA_wxaui_H__
#define __HOOK_WXLUA_wxaui_H__

#include "wxbind/include/wxbinddefs.h"
#include "wxluasetup.h"
#include "wxbind/include/wxcore_bind.h"

#include "wxlua/wxlstate.h"
#include "wxlua/wxlbind.h"

// ---------------------------------------------------------------------------
// Check if the version of binding generator used to create this is older than
// the current version of the bindings.
// See 'bindings/genwxbind.lua' and 'modules/wxlua/wxldefs.h'
#if WXLUA_BINDING_VERSION > 30
# error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
#endif //WXLUA_BINDING_VERSION > 30
// ---------------------------------------------------------------------------

// binding class
class WXDLLIMPEXP_BINDWXAUI wxLuaBinding_wxaui : public wxLuaBinding
{
public:
wxLuaBinding_wxaui();


private:
DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxaui)
};


// initialize wxLuaBinding_wxaui for all wxLuaStates
extern WXDLLIMPEXP_BINDWXAUI wxLuaBinding* wxLuaBinding_wxaui_init();

// ---------------------------------------------------------------------------
// Includes
// ---------------------------------------------------------------------------

#if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI
#include "wx/aui/aui.h"
#endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI

// ---------------------------------------------------------------------------
// Lua Tag Method Values and Tables for each Class
// ---------------------------------------------------------------------------

#if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiDefaultDockArt;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiDefaultTabArt;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiDefaultToolBarArt;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiDockArt;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiDockInfo;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiDockUIPart;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiFloatingFrame;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiMDIChildFrame;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiMDIClientWindow;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiMDIParentFrame;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiManager;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiManagerEvent;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiNotebook;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiNotebookEvent;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiNotebookPage;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiNotebookPageArray;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiPaneButton;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiPaneInfo;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiPaneInfoArray;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiSimpleTabArt;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiTabArt;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiTabContainerButton;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiTabCtrl;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiToolBar;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiToolBarArt;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiToolBarEvent;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiToolBarItem;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiToolBarItemArray;
#endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI



#endif // __HOOK_WXLUA_wxaui_H__

// ---------------------------------------------------------------------------
// wxaui.h - headers and wxLua types for wxLua binding
//
// This file was generated by genwxbind.lua
// Any changes made to this file will be lost when the file is regenerated
// ---------------------------------------------------------------------------

#ifndef __HOOK_WXLUA_wxaui_H__
#define __HOOK_WXLUA_wxaui_H__

#include "wxbind/include/wxbinddefs.h"
#include "wxluasetup.h"
#include "wxbind/include/wxcore_bind.h"

#include "wxlua/wxlstate.h"
#include "wxlua/wxlbind.h"

// ---------------------------------------------------------------------------
// Check if the version of binding generator used to create this is older than
// the current version of the bindings.
// See 'bindings/genwxbind.lua' and 'modules/wxlua/wxldefs.h'
#if WXLUA_BINDING_VERSION > 30
# error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
#endif //WXLUA_BINDING_VERSION > 30
// ---------------------------------------------------------------------------

// binding class
class WXDLLIMPEXP_BINDWXAUI wxLuaBinding_wxaui : public wxLuaBinding
{
public:
wxLuaBinding_wxaui();


private:
DECLARE_DYNAMIC_CLASS(wxLuaBinding_wxaui)
};


// initialize wxLuaBinding_wxaui for all wxLuaStates
extern WXDLLIMPEXP_BINDWXAUI wxLuaBinding* wxLuaBinding_wxaui_init();

// ---------------------------------------------------------------------------
// Includes
// ---------------------------------------------------------------------------

#if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI
#include "wx/aui/aui.h"
#endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI

// ---------------------------------------------------------------------------
// Lua Tag Method Values and Tables for each Class
// ---------------------------------------------------------------------------

#if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiDefaultDockArt;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiDefaultTabArt;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiDefaultToolBarArt;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiDockArt;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiDockInfo;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiDockUIPart;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiFloatingFrame;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiMDIChildFrame;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiMDIClientWindow;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiMDIParentFrame;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiManager;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiManagerEvent;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiNotebook;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiNotebookEvent;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiNotebookPage;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiNotebookPageArray;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiPaneButton;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiPaneInfo;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiPaneInfoArray;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiSimpleTabArt;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiTabArt;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiTabContainerButton;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiTabCtrl;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiToolBar;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiToolBarArt;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiToolBarEvent;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiToolBarItem;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiToolBarItemArray;
#endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI



#endif // __HOOK_WXLUA_wxaui_H__

Loading

0 comments on commit 0b3de8d

Please sign in to comment.