restored mask copying code when converting a wxBitmap to a wxImage (wxMSW only)

[wxWidgets.git] / src / generic / gridctrl.cpp

diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp
index 23fa38899a644469ba227ef7387849786ffe1981..a7491003d7f82a970a765215fae0b8d547034cf0 100644 (file)
--- a/src/generic/gridctrl.cpp
+++ b/src/generic/gridctrl.cpp
@@ -9,8 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #pragma interface "gridctrl.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma implementation "gridctrl.h"

 #endif
 
 #include "wx/wxprec.h"
 #endif
 
 #include "wx/wxprec.h"


@@ -19,6 +19,13 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_GRID
+
+#ifndef WX_PRECOMP
+    #include "wx/textctrl.h"
+    #include "wx/dc.h"
+#endif // WX_PRECOMP
+

 #include "wx/generic/gridctrl.h"
 #include "wx/tokenzr.h"
 
 #include "wx/generic/gridctrl.h"
 #include "wx/tokenzr.h"
 


@@ -26,6 +33,8 @@
 // wxGridCellDateTimeRenderer
 // ----------------------------------------------------------------------------
 
 // wxGridCellDateTimeRenderer
 // ----------------------------------------------------------------------------
 

+#if wxUSE_DATETIME
+

 // Enables a grid cell to display a formated date and or time
 
 wxGridCellDateTimeRenderer::wxGridCellDateTimeRenderer(wxString outformat, wxString informat)
 // Enables a grid cell to display a formated date and or time
 
 wxGridCellDateTimeRenderer::wxGridCellDateTimeRenderer(wxString outformat, wxString informat)


@@ -110,10 +119,12 @@ wxSize wxGridCellDateTimeRenderer::GetBestSize(wxGrid& grid,
 }
 
 void wxGridCellDateTimeRenderer::SetParameters(const wxString& params){
 }
 
 void wxGridCellDateTimeRenderer::SetParameters(const wxString& params){

-    if(params)
+    if (!params.IsEmpty())

         m_oformat=params;
 }
 
         m_oformat=params;
 }
 

+#endif // wxUSE_DATETIME
+

 // ----------------------------------------------------------------------------
 // wxGridCellChoiceNumberRenderer
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxGridCellChoiceNumberRenderer
 // ----------------------------------------------------------------------------


@@ -123,7 +134,7 @@ void wxGridCellDateTimeRenderer::SetParameters(const wxString& params){
 
 wxGridCellEnumRenderer::wxGridCellEnumRenderer(const wxString& choices)
 {
 
 wxGridCellEnumRenderer::wxGridCellEnumRenderer(const wxString& choices)
 {

-    if(choices)
+    if (!choices.IsEmpty())

         SetParameters(choices);
 }
 
         SetParameters(choices);
 }
 


@@ -200,17 +211,22 @@ void wxGridCellEnumRenderer::SetParameters(const wxString& params)
     }
 }
 
     }
 }
 

+#if wxUSE_COMBOBOX
+

 // ----------------------------------------------------------------------------
 // wxGridCellEnumEditor
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxGridCellEnumEditor
 // ----------------------------------------------------------------------------

-// A cell editor which displays an enum number as a textual equivalent.
-// eg data in cell is 0,1,2 ... n the cell could be displayed as "John","Fred"..."Bob"
-// in the combo choice box
-//
+
+// A cell editor which displays an enum number as a textual equivalent. eg
+// data in cell is 0,1,2 ... n the cell could be displayed as
+// "John","Fred"..."Bob" in the combo choice box
+

 wxGridCellEnumEditor::wxGridCellEnumEditor(const wxString& choices)
                     : wxGridCellChoiceEditor()
 {
 wxGridCellEnumEditor::wxGridCellEnumEditor(const wxString& choices)
                     : wxGridCellChoiceEditor()
 {

-    if(choices)
+    m_startint = -1;
+
+    if (!choices.IsEmpty())

         SetParameters(choices);
 }
 
         SetParameters(choices);
 }
 


@@ -260,12 +276,17 @@ bool wxGridCellEnumEditor::EndEdit(int row, int col, wxGrid* grid)
         if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_NUMBER))
             grid->GetTable()->SetValueAsLong(row, col, pos);
         else
         if (grid->GetTable()->CanSetValueAs(row, col, wxGRID_VALUE_NUMBER))
             grid->GetTable()->SetValueAsLong(row, col, pos);
         else

-            grid->GetTable()->SetValue(row, col,wxString::Format("%i",pos));
+            grid->GetTable()->SetValue(row, col,wxString::Format(wxT("%i"),pos));

     }
 
     return changed;
 }
 
     }
 
     return changed;
 }
 

+#endif // wxUSE_COMBOBOX
+
+// ----------------------------------------------------------------------------
+// wxGridCellAutoWrapStringEditor
+// ----------------------------------------------------------------------------

 
 void
 wxGridCellAutoWrapStringEditor::Create(wxWindow* parent,
 
 void
 wxGridCellAutoWrapStringEditor::Create(wxWindow* parent,


@@ -323,7 +344,7 @@ wxGridCellAutoWrapStringRenderer::GetTextLines(wxGrid& grid,
 
     dc.SetFont(attr.GetFont());
     wxStringTokenizer tk(data , _T(" \n\t\r"));
 
     dc.SetFont(attr.GetFont());
     wxStringTokenizer tk(data , _T(" \n\t\r"));

-    wxString thisline("");
+    wxString thisline(wxT(""));

 
     while ( tk.HasMoreTokens() )
     {
 
     while ( tk.HasMoreTokens() )
     {


@@ -358,13 +379,13 @@ wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid& grid,
                                               wxDC& dc,
                                               int row, int col)
 {
                                               wxDC& dc,
                                               int row, int col)
 {

-    int x,y, height , width = grid.GetColSize(col) -10;
+    wxCoord x,y, height , width = grid.GetColSize(col) -10;

     int count = 250; //Limit iterations..
 
     wxRect rect(0,0,width,10);
 
     // M is a nice large character 'y' gives descender!.
     int count = 250; //Limit iterations..
 
     wxRect rect(0,0,width,10);
 
     // M is a nice large character 'y' gives descender!.

-    dc.GetTextExtent("My", &x, &y);
+    dc.GetTextExtent(wxT("My"), &x, &y);

 
     do
     {
 
     do
     {


@@ -379,3 +400,5 @@ wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid& grid,
     return wxSize(width,height);
 }
 
     return wxSize(width,height);
 }
 

+#endif // wxUSE_GRID
+