[ 1557284 ] wxGenericComboControl -> wxGenericComboCtrl

[wxWidgets.git] / include / wx / generic / grid.h

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index faa87dded8ecb20418835ebf0e7397a0a50ca9ae..ead133cc7bfba42b9a7f73b1100c00df532a0cd0 100644 (file)
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -2,22 +2,16 @@
 // Name:        wx/generic/grid.h
 // Purpose:     wxGrid and related classes
 // Author:      Michael Bedward (based on code by Julian Smart, Robin Dunn)
 // Name:        wx/generic/grid.h
 // Purpose:     wxGrid and related classes
 // Author:      Michael Bedward (based on code by Julian Smart, Robin Dunn)

-// Modified by:
+// Modified by: Santiago Palacios

 // Created:     1/08/1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Michael Bedward
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Created:     1/08/1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Michael Bedward
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/defs.h"
-

 #ifndef __WXGRID_H__
 #define __WXGRID_H__
 
 #ifndef __WXGRID_H__
 #define __WXGRID_H__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "grid.h"
-#endif
-

 #include "wx/hashmap.h"
 #include "wx/panel.h"
 #include "wx/scrolwin.h"
 #include "wx/hashmap.h"
 #include "wx/panel.h"
 #include "wx/scrolwin.h"


@@ -34,6 +28,8 @@
 // constants
 // ----------------------------------------------------------------------------
 
 // constants
 // ----------------------------------------------------------------------------
 

+extern WXDLLEXPORT_DATA(const wxChar) wxGridNameStr[];
+

 // Default parameters for wxGrid
 //
 #define WXGRID_DEFAULT_NUMBER_ROWS            10
 // Default parameters for wxGrid
 //
 #define WXGRID_DEFAULT_NUMBER_ROWS            10


@@ -107,7 +103,7 @@ public:
     // calling DecRef() once will delete it. Calling IncRef() allows to lock
     // it until the matching DecRef() is called
     void IncRef() { m_nRef++; }
     // calling DecRef() once will delete it. Calling IncRef() allows to lock
     // it until the matching DecRef() is called
     void IncRef() { m_nRef++; }

-    void DecRef() { if ( !--m_nRef ) delete this; }
+    void DecRef() { if ( --m_nRef == 0 ) delete this; }

 
     // interpret renderer parameters: arbitrary string whose interpretatin is
     // left to the derived classes
 
     // interpret renderer parameters: arbitrary string whose interpretatin is
     // left to the derived classes


@@ -184,13 +180,13 @@ public:
 
 protected:
     // set the text colours before drawing
 
 protected:
     // set the text colours before drawing

-    void SetTextColoursAndFont(wxGrid& grid,
-                               wxGridCellAttr& attr,
+    void SetTextColoursAndFont(const wxGrid& grid,
+                               const wxGridCellAttr& attr,

                                wxDC& dc,
                                bool isSelected);
 
     // calc the string extent for given string/font
                                wxDC& dc,
                                bool isSelected);
 
     // calc the string extent for given string/font

-    wxSize DoGetBestSize(wxGridCellAttr& attr,
+    wxSize DoGetBestSize(const wxGridCellAttr& attr,

                          wxDC& dc,
                          const wxString& text);
 };
                          wxDC& dc,
                          const wxString& text);
 };


@@ -216,7 +212,7 @@ public:
         { return new wxGridCellNumberRenderer; }
 
 protected:
         { return new wxGridCellNumberRenderer; }
 
 protected:

-    wxString GetString(wxGrid& grid, int row, int col);
+    wxString GetString(const wxGrid& grid, int row, int col);

 };
 
 class WXDLLIMPEXP_ADV wxGridCellFloatRenderer : public wxGridCellStringRenderer
 };
 
 class WXDLLIMPEXP_ADV wxGridCellFloatRenderer : public wxGridCellStringRenderer


@@ -249,7 +245,7 @@ public:
     virtual wxGridCellRenderer *Clone() const;
 
 protected:
     virtual wxGridCellRenderer *Clone() const;
 
 protected:

-    wxString GetString(wxGrid& grid, int row, int col);
+    wxString GetString(const wxGrid& grid, int row, int col);

 
 private:
     // formatting parameters
 
 private:
     // formatting parameters


@@ -547,6 +543,7 @@ public:
 
     virtual void Reset();
     virtual void StartingClick();
 
     virtual void Reset();
     virtual void StartingClick();

+    virtual void StartingKey(wxKeyEvent& event);

 
     virtual wxGridCellEditor *Clone() const
         { return new wxGridCellBoolEditor; }
 
     virtual wxGridCellEditor *Clone() const
         { return new wxGridCellBoolEditor; }


@@ -661,7 +658,7 @@ public:
     // calling DecRef() once will delete it. Calling IncRef() allows to lock
     // it until the matching DecRef() is called
     void IncRef() { m_nRef++; }
     // calling DecRef() once will delete it. Calling IncRef() allows to lock
     // it until the matching DecRef() is called
     void IncRef() { m_nRef++; }

-    void DecRef() { if ( !--m_nRef ) delete this; }
+    void DecRef() { if ( --m_nRef == 0 ) delete this; }

 
     // setters
     void SetTextColour(const wxColour& colText) { m_colText = colText; }
 
     // setters
     void SetTextColour(const wxColour& colText) { m_colText = colText; }


@@ -695,6 +692,7 @@ public:
     bool HasEditor() const { return m_editor != NULL; }
     bool HasReadWriteMode() const { return m_isReadOnly != Unset; }
     bool HasOverflowMode() const { return m_overflow != UnsetOverflow; }
     bool HasEditor() const { return m_editor != NULL; }
     bool HasReadWriteMode() const { return m_isReadOnly != Unset; }
     bool HasOverflowMode() const { return m_overflow != UnsetOverflow; }

+    bool HasSize() const { return m_sizeRows != 1 || m_sizeCols != 1; }

 
     const wxColour& GetTextColour() const;
     const wxColour& GetBackgroundColour() const;
 
     const wxColour& GetTextColour() const;
     const wxColour& GetBackgroundColour() const;


@@ -712,6 +710,14 @@ public:
 
     void SetDefAttr(wxGridCellAttr* defAttr) { m_defGridAttr = defAttr; }
 
 
     void SetDefAttr(wxGridCellAttr* defAttr) { m_defGridAttr = defAttr; }
 

+protected:
+    // the dtor is private because only DecRef() can delete us
+    virtual ~wxGridCellAttr()
+    {
+        wxSafeDecRef(m_renderer);
+        wxSafeDecRef(m_editor);
+    }
+

 private:
     enum wxAttrReadMode
     {
 private:
     enum wxAttrReadMode
     {


@@ -730,12 +736,6 @@ private:
     // the common part of all ctors
     void Init(wxGridCellAttr *attrDefault = NULL);
 
     // the common part of all ctors
     void Init(wxGridCellAttr *attrDefault = NULL);
 

-    // the dtor is private because only DecRef() can delete us
-    ~wxGridCellAttr()
-    {
-        wxSafeDecRef(m_renderer);
-        wxSafeDecRef(m_editor);
-    }

 
     // the ref count - when it goes to 0, we die
     size_t   m_nRef;
 
     // the ref count - when it goes to 0, we die
     size_t   m_nRef;


@@ -1079,14 +1079,14 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxWANTS_CHARS,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxWANTS_CHARS,

-            const wxString& name = wxPanelNameStr );
+            const wxString& name = wxGridNameStr );

 
     bool Create( wxWindow *parent,
             wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxWANTS_CHARS,
 
     bool Create( wxWindow *parent,
             wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxWANTS_CHARS,

-            const wxString& name = wxPanelNameStr );
+            const wxString& name = wxGridNameStr );

 
     virtual ~wxGrid();
 
 
     virtual ~wxGrid();
 


@@ -1125,6 +1125,7 @@ public:
 
     void DoEndDragResizeRow();
     void DoEndDragResizeCol();
 
     void DoEndDragResizeRow();
     void DoEndDragResizeCol();

+    void DoEndDragMoveCol();

 
     wxGridTableBase * GetTable() const { return m_table; }
     bool SetTable( wxGridTableBase *table, bool takeOwnership = false,
 
     wxGridTableBase * GetTable() const { return m_table; }
     bool SetTable( wxGridTableBase *table, bool takeOwnership = false,


@@ -1175,7 +1176,7 @@ public:
     //
     void StringToLines( const wxString& value, wxArrayString& lines );
 
     //
     void StringToLines( const wxString& value, wxArrayString& lines );
 

-    void GetTextBoxSize( wxDC& dc,
+    void GetTextBoxSize( const wxDC& dc,

                          const wxArrayString& lines,
                          long *width, long *height );
 
                          const wxArrayString& lines,
                          long *width, long *height );
 


@@ -1228,7 +1229,7 @@ public:
     //
     void XYToCell( int x, int y, wxGridCellCoords& );
     int  YToRow( int y );
     //
     void XYToCell( int x, int y, wxGridCellCoords& );
     int  YToRow( int y );

-    int  XToCol( int x );
+    int  XToCol( int x, bool clipToMinMax = false );

 
     int  YToEdgeOfRow( int y );
     int  XToEdgeOfCol( int x );
 
     int  YToEdgeOfRow( int y );
     int  XToEdgeOfCol( int x );


@@ -1283,6 +1284,12 @@ public:
     wxString GetRowLabelValue( int row );
     wxString GetColLabelValue( int col );
     wxColour GetGridLineColour() { return m_gridLineColour; }
     wxString GetRowLabelValue( int row );
     wxString GetColLabelValue( int col );
     wxColour GetGridLineColour() { return m_gridLineColour; }

+
+    // these methods may be overridden to customize individual grid lines
+    // appearance
+    virtual wxPen GetDefaultGridLinePen();
+    virtual wxPen GetRowGridLinePen(int row);
+    virtual wxPen GetColGridLinePen(int col);

     wxColour GetCellHighlightColour() { return m_cellHighlightColour; }
     int      GetCellHighlightPenWidth() { return m_cellHighlightPenWidth; }
     int      GetCellHighlightROPenWidth() { return m_cellHighlightROPenWidth; }
     wxColour GetCellHighlightColour() { return m_cellHighlightColour; }
     int      GetCellHighlightPenWidth() { return m_cellHighlightPenWidth; }
     int      GetCellHighlightROPenWidth() { return m_cellHighlightROPenWidth; }


@@ -1308,6 +1315,9 @@ public:
     void     EnableDragColSize( bool enable = true );
     void     DisableDragColSize() { EnableDragColSize( false ); }
     bool     CanDragColSize() { return m_canDragColSize; }
     void     EnableDragColSize( bool enable = true );
     void     DisableDragColSize() { EnableDragColSize( false ); }
     bool     CanDragColSize() { return m_canDragColSize; }

+    void     EnableDragColMove( bool enable = true );
+    void     DisableDragColMove() { EnableDragColMove( false ); }
+    bool     CanDragColMove() { return m_canDragColMove; }

     void     EnableDragGridSize(bool enable = true);
     void     DisableDragGridSize() { EnableDragGridSize(false); }
     bool     CanDragGridSize() { return m_canDragGridSize; }
     void     EnableDragGridSize(bool enable = true);
     void     DisableDragGridSize() { EnableDragGridSize(false); }
     bool     CanDragGridSize() { return m_canDragGridSize; }


@@ -1363,6 +1373,33 @@ public:
 
     void     SetColSize( int col, int width );
 
 
     void     SetColSize( int col, int width );
 

+    //Column positions
+    int GetColAt( int colPos ) const
+    {
+        if ( m_colAt.IsEmpty() )
+            return colPos;
+        else
+            return m_colAt[colPos];
+    }
+
+    void SetColPos( int colID, int newPos );
+
+    int GetColPos( int colID ) const
+    {
+        if ( m_colAt.IsEmpty() )
+            return colID;
+        else
+        {
+            for ( int i = 0; i < m_numCols; i++ )
+            {
+                if ( m_colAt[i] == colID )
+                    return i;
+            }
+        }
+
+        return -1;
+    }
+

     // automatically size the column or row to fit to its contents, if
     // setAsMin is true, this optimal width will also be set as minimal width
     // for this column
     // automatically size the column or row to fit to its contents, if
     // setAsMin is true, this optimal width will also be set as minimal width
     // for this column


@@ -1871,7 +1908,8 @@ protected:
         WXGRID_CURSOR_RESIZE_ROW,
         WXGRID_CURSOR_RESIZE_COL,
         WXGRID_CURSOR_SELECT_ROW,
         WXGRID_CURSOR_RESIZE_ROW,
         WXGRID_CURSOR_RESIZE_COL,
         WXGRID_CURSOR_SELECT_ROW,

-        WXGRID_CURSOR_SELECT_COL
+        WXGRID_CURSOR_SELECT_COL,
+        WXGRID_CURSOR_MOVE_COL

     };
 
     // this method not only sets m_cursorMode but also sets the correct cursor
     };
 
     // this method not only sets m_cursorMode but also sets the correct cursor


@@ -1887,8 +1925,13 @@ protected:
     wxWindow *m_winCapture;     // the window which captured the mouse
     CursorMode m_cursorMode;
 
     wxWindow *m_winCapture;     // the window which captured the mouse
     CursorMode m_cursorMode;
 

+    //Column positions
+    wxArrayInt m_colAt;
+    int m_moveToCol;
+

     bool    m_canDragRowSize;
     bool    m_canDragColSize;
     bool    m_canDragRowSize;
     bool    m_canDragColSize;

+    bool    m_canDragColMove;

     bool    m_canDragGridSize;
     bool    m_canDragCell;
     int     m_dragLastPos;
     bool    m_canDragGridSize;
     bool    m_canDragCell;
     int     m_dragLastPos;


@@ -1929,6 +1972,7 @@ protected:
     void OnSize( wxSizeEvent& );
     void OnKeyDown( wxKeyEvent& );
     void OnKeyUp( wxKeyEvent& );
     void OnSize( wxSizeEvent& );
     void OnKeyDown( wxKeyEvent& );
     void OnKeyUp( wxKeyEvent& );

+    void OnChar( wxKeyEvent& );

     void OnEraseBackground( wxEraseEvent& );
 
 
     void OnEraseBackground( wxEraseEvent& );
 
 


@@ -1981,6 +2025,14 @@ public:
     bool        MetaDown() { return m_meta; }
     bool        ShiftDown() { return m_shift; }
     bool        AltDown() { return m_alt; }
     bool        MetaDown() { return m_meta; }
     bool        ShiftDown() { return m_shift; }
     bool        AltDown() { return m_alt; }

+    bool        CmdDown()
+    {
+#if defined(__WXMAC__) || defined(__WXCOCOA__)
+        return MetaDown();
+#else
+        return ControlDown();
+#endif
+    }

 
 protected:
     int         m_row;
 
 protected:
     int         m_row;


@@ -2015,6 +2067,14 @@ public:
     bool        MetaDown() { return m_meta; }
     bool        ShiftDown() { return m_shift; }
     bool        AltDown() { return m_alt; }
     bool        MetaDown() { return m_meta; }
     bool        ShiftDown() { return m_shift; }
     bool        AltDown() { return m_alt; }

+    bool        CmdDown()
+    {
+#if defined(__WXMAC__) || defined(__WXCOCOA__)
+        return MetaDown();
+#else
+        return ControlDown();
+#endif
+    }

 
 protected:
     int         m_rowOrCol;
 
 protected:
     int         m_rowOrCol;


@@ -2062,6 +2122,14 @@ public:
     bool        MetaDown()     { return m_meta; }
     bool        ShiftDown()    { return m_shift; }
     bool        AltDown()      { return m_alt; }
     bool        MetaDown()     { return m_meta; }
     bool        ShiftDown()    { return m_shift; }
     bool        AltDown()      { return m_alt; }

+    bool        CmdDown()
+    {
+#if defined(__WXMAC__) || defined(__WXCOCOA__)
+        return MetaDown();
+#else
+        return ControlDown();
+#endif
+    }

 
 protected:
     wxGridCellCoords  m_topLeft;
 
 protected:
     wxGridCellCoords  m_topLeft;