1
0

Merging r6250 through r6254 from trunk to ogl-es branch

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6255 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-08-27 19:14:39 +00:00
parent 21302d038a
commit ee3579015b
275 changed files with 4166 additions and 3846 deletions

View File

@@ -5,8 +5,8 @@
// 07.10.2005 - Multicolor-Listbox addet by A. Buschhueter (Acki)
// A_Buschhueter@gmx.de
#ifndef __C_GUI_TABLE_BAR_H_INCLUDED__
#define __C_GUI_TABLE_BAR_H_INCLUDED__
#ifndef IRR_C_GUI_TABLE_BAR_H_INCLUDED
#define IRR_C_GUI_TABLE_BAR_H_INCLUDED
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_
@@ -35,52 +35,52 @@ namespace gui
//! Adds a column
//! If columnIndex is outside the current range, do push new column at the end
virtual void addColumn(const wchar_t* caption, s32 columnIndex=-1) _IRR_OVERRIDE_;
virtual void addColumn(const wchar_t* caption, s32 columnIndex=-1) IRR_OVERRIDE;
//! remove a column from the table
virtual void removeColumn(u32 columnIndex) _IRR_OVERRIDE_;
virtual void removeColumn(u32 columnIndex) IRR_OVERRIDE;
//! Returns the number of columns in the table control
virtual s32 getColumnCount() const _IRR_OVERRIDE_;
virtual s32 getColumnCount() const IRR_OVERRIDE;
//! Makes a column active. This will trigger an ordering process.
/** \param idx: The id of the column to make active.
\return True if successful. */
virtual bool setActiveColumn(s32 columnIndex, bool doOrder=false) _IRR_OVERRIDE_;
virtual bool setActiveColumn(s32 columnIndex, bool doOrder=false) IRR_OVERRIDE;
//! Returns which header is currently active
virtual s32 getActiveColumn() const _IRR_OVERRIDE_;
virtual s32 getActiveColumn() const IRR_OVERRIDE;
//! Returns the ordering used by the currently active column
virtual EGUI_ORDERING_MODE getActiveColumnOrdering() const _IRR_OVERRIDE_;
virtual EGUI_ORDERING_MODE getActiveColumnOrdering() const IRR_OVERRIDE;
//! set a column width
virtual void setColumnWidth(u32 columnIndex, u32 width) _IRR_OVERRIDE_;
virtual void setColumnWidth(u32 columnIndex, u32 width) IRR_OVERRIDE;
//! Get the width of a column
virtual u32 getColumnWidth(u32 columnIndex) const _IRR_OVERRIDE_;
virtual u32 getColumnWidth(u32 columnIndex) const IRR_OVERRIDE;
//! columns can be resized by drag 'n drop
virtual void setResizableColumns(bool resizable) _IRR_OVERRIDE_;
virtual void setResizableColumns(bool resizable) IRR_OVERRIDE;
//! can columns be resized by drag 'n drop?
virtual bool hasResizableColumns() const _IRR_OVERRIDE_;
virtual bool hasResizableColumns() const IRR_OVERRIDE;
//! This tells the table control which ordering mode should be used when
//! a column header is clicked.
/** \param columnIndex: The index of the column header.
\param state: If true, a EGET_TABLE_HEADER_CHANGED message will be sent and you can order the table data as you whish.*/
//! \param mode: One of the modes defined in EGUI_COLUMN_ORDERING
virtual void setColumnOrdering(u32 columnIndex, EGUI_COLUMN_ORDERING mode) _IRR_OVERRIDE_;
virtual void setColumnOrdering(u32 columnIndex, EGUI_COLUMN_ORDERING mode) IRR_OVERRIDE;
//! Returns which row is currently selected
virtual s32 getSelected() const _IRR_OVERRIDE_;
virtual s32 getSelected() const IRR_OVERRIDE;
//! set currently selected row
virtual void setSelected( s32 index ) _IRR_OVERRIDE_;
virtual void setSelected( s32 index ) IRR_OVERRIDE;
//! Returns amount of rows in the tab control
virtual s32 getRowCount() const _IRR_OVERRIDE_;
virtual s32 getRowCount() const IRR_OVERRIDE;
//! adds a row to the table
/** \param rowIndex: zero based index of rows. The row will be
@@ -89,16 +89,16 @@ namespace gui
than the actual number of rows by more than one, it
won't be created. Note that if you create a row that is
not at the end, there might be performance issues*/
virtual u32 addRow(u32 rowIndex) _IRR_OVERRIDE_;
virtual u32 addRow(u32 rowIndex) IRR_OVERRIDE;
//! Remove a row from the table
virtual void removeRow(u32 rowIndex) _IRR_OVERRIDE_;
virtual void removeRow(u32 rowIndex) IRR_OVERRIDE;
//! clear the table rows, but keep the columns intact
virtual void clearRows() _IRR_OVERRIDE_;
virtual void clearRows() IRR_OVERRIDE;
//! Swap two row positions. This is useful for a custom ordering algo.
virtual void swapRows(u32 rowIndexA, u32 rowIndexB) _IRR_OVERRIDE_;
virtual void swapRows(u32 rowIndexA, u32 rowIndexB) IRR_OVERRIDE;
//! This tells the table to start ordering all the rows. You
//! need to explicitly tell the table to reorder the rows when
@@ -106,77 +106,77 @@ namespace gui
//! the system more flexible and doesn't make you pay the cost
//! of ordering when adding a lot of rows.
//! \param columnIndex: When set to -1 the active column is used.
virtual void orderRows(s32 columnIndex=-1, EGUI_ORDERING_MODE mode=EGOM_NONE) _IRR_OVERRIDE_;
virtual void orderRows(s32 columnIndex=-1, EGUI_ORDERING_MODE mode=EGOM_NONE) IRR_OVERRIDE;
//! Set the text of a cell
virtual void setCellText(u32 rowIndex, u32 columnIndex, const core::stringw& text) _IRR_OVERRIDE_;
virtual void setCellText(u32 rowIndex, u32 columnIndex, const core::stringw& text) IRR_OVERRIDE;
//! Set the text of a cell, and set a color of this cell.
virtual void setCellText(u32 rowIndex, u32 columnIndex, const core::stringw& text, video::SColor color) _IRR_OVERRIDE_;
virtual void setCellText(u32 rowIndex, u32 columnIndex, const core::stringw& text, video::SColor color) IRR_OVERRIDE;
//! Set the data of a cell
//! data will not be serialized.
virtual void setCellData(u32 rowIndex, u32 columnIndex, void *data) _IRR_OVERRIDE_;
virtual void setCellData(u32 rowIndex, u32 columnIndex, void *data) IRR_OVERRIDE;
//! Set the color of a cell text
virtual void setCellColor(u32 rowIndex, u32 columnIndex, video::SColor color) _IRR_OVERRIDE_;
virtual void setCellColor(u32 rowIndex, u32 columnIndex, video::SColor color) IRR_OVERRIDE;
//! Get the text of a cell
virtual const wchar_t* getCellText(u32 rowIndex, u32 columnIndex ) const _IRR_OVERRIDE_;
virtual const wchar_t* getCellText(u32 rowIndex, u32 columnIndex ) const IRR_OVERRIDE;
//! Get the data of a cell
virtual void* getCellData(u32 rowIndex, u32 columnIndex ) const _IRR_OVERRIDE_;
virtual void* getCellData(u32 rowIndex, u32 columnIndex ) const IRR_OVERRIDE;
//! clears the table, deletes all items in the table
virtual void clear() _IRR_OVERRIDE_;
virtual void clear() IRR_OVERRIDE;
//! called if an event happened.
virtual bool OnEvent(const SEvent &event) _IRR_OVERRIDE_;
virtual bool OnEvent(const SEvent &event) IRR_OVERRIDE;
//! draws the element and its children
virtual void draw() _IRR_OVERRIDE_;
virtual void draw() IRR_OVERRIDE;
//! Set flags, as defined in EGUI_TABLE_DRAW_FLAGS, which influence the layout
virtual void setDrawFlags(s32 flags) _IRR_OVERRIDE_;
virtual void setDrawFlags(s32 flags) IRR_OVERRIDE;
//! Get the flags, as defined in EGUI_TABLE_DRAW_FLAGS, which influence the layout
virtual s32 getDrawFlags() const _IRR_OVERRIDE_;
virtual s32 getDrawFlags() const IRR_OVERRIDE;
//! Sets another skin independent font.
virtual void setOverrideFont(IGUIFont* font=0) _IRR_OVERRIDE_;
virtual void setOverrideFont(IGUIFont* font=0) IRR_OVERRIDE;
//! Gets the override font (if any)
virtual IGUIFont* getOverrideFont() const _IRR_OVERRIDE_;
virtual IGUIFont* getOverrideFont() const IRR_OVERRIDE;
//! Get the font which is used right now for drawing
virtual IGUIFont* getActiveFont() const _IRR_OVERRIDE_;
virtual IGUIFont* getActiveFont() const IRR_OVERRIDE;
//! Get the height of items/rows
virtual s32 getItemHeight() const _IRR_OVERRIDE_;
virtual s32 getItemHeight() const IRR_OVERRIDE;
//! Access the vertical scrollbar
virtual IGUIScrollBar* getVerticalScrollBar() const _IRR_OVERRIDE_;
virtual IGUIScrollBar* getVerticalScrollBar() const IRR_OVERRIDE;
//! Access the horizontal scrollbar
virtual IGUIScrollBar* getHorizontalScrollBar() const _IRR_OVERRIDE_;
virtual IGUIScrollBar* getHorizontalScrollBar() const IRR_OVERRIDE;
//! Sets whether to draw the background.
virtual void setDrawBackground(bool draw) _IRR_OVERRIDE_;
virtual void setDrawBackground(bool draw) IRR_OVERRIDE;
//! Checks if background drawing is enabled
/** \return true if background drawing is enabled, false otherwise */
virtual bool isDrawBackgroundEnabled() const _IRR_OVERRIDE_;
virtual bool isDrawBackgroundEnabled() const IRR_OVERRIDE;
//! Writes attributes of the object.
//! Implement this to expose the attributes of your scene node animator for
//! scripting languages, editors, debuggers or xml serialization purposes.
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const _IRR_OVERRIDE_;
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const IRR_OVERRIDE;
//! Reads attributes of the object.
//! Implement this to set the attributes of your scene node animator for
//! scripting languages, editors, debuggers or xml deserialization purposes.
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) _IRR_OVERRIDE_;
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0) IRR_OVERRIDE;
protected:
void refreshControls();
@@ -251,4 +251,3 @@ namespace gui
#endif // _IRR_COMPILE_WITH_GUI_
#endif