Fixed overlapping buttons in wizard on MacOS X

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

diff --git a/src/generic/gridg.cpp b/src/generic/gridg.cpp
index 4c33a1a32ad2b7d1be9294b9912ad6fab3580f94..a4d53fc4352de9e49011b511100964022e253399 100644 (file)
--- a/src/generic/gridg.cpp
+++ b/src/generic/gridg.cpp
@@ -25,7 +25,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_GRID
+#if wxUSE_GRID && !(wxUSE_NEW_GRID)

 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"


@@ -216,7 +216,7 @@ bool wxGenericGrid::Create(wxWindow *parent,
   m_dragRowOrCol = 0;
   m_dragStartPosition = 0;
   m_dragLastPosition = 0;
   m_dragRowOrCol = 0;
   m_dragStartPosition = 0;
   m_dragLastPosition = 0;

-  m_divisionPen = * wxThePenList->FindOrCreatePen("LIGHT GREY", 1, wxSOLID);
+  m_divisionPen = * wxThePenList->FindOrCreatePen(wxT("LIGHT GREY"), 1, wxSOLID);

   m_highlightPen = * wxBLACK_PEN;
   m_doubleBufferingBitmap = (wxBitmap *) NULL;
 
   m_highlightPen = * wxBLACK_PEN;
   m_doubleBufferingBitmap = (wxBitmap *) NULL;
 


@@ -267,7 +267,7 @@ bool wxGenericGrid::Create(wxWindow *parent,
 
   m_editingPanel = new wxPanel(this);
 
 
   m_editingPanel = new wxPanel(this);
 

-  m_textItem = new wxTextCtrl(m_editingPanel, wxGRID_TEXT_CTRL, "",
+  m_textItem = new wxTextCtrl(m_editingPanel, wxGRID_TEXT_CTRL, wxT(""),

                               wxPoint(m_editControlPosition.x, m_editControlPosition.y),
                               wxSize(m_editControlPosition.width, -1),
                               wxTE_PROCESS_ENTER);
                               wxPoint(m_editControlPosition.x, m_editControlPosition.y),
                               wxSize(m_editControlPosition.width, -1),
                               wxTE_PROCESS_ENTER);


@@ -287,7 +287,7 @@ bool wxGenericGrid::Create(wxWindow *parent,
 
 //  SetSize(pos.x, pos.y, size.x, size.y);
 
 
 //  SetSize(pos.x, pos.y, size.x, size.y);
 

-  m_inPlaceTextItem = new wxTextCtrl( (wxPanel*)this, wxGRID_EDIT_IN_PLACE_TEXT_CTRL, "",
+  m_inPlaceTextItem = new wxTextCtrl( (wxPanel*)this, wxGRID_EDIT_IN_PLACE_TEXT_CTRL, wxT(""),

                                       wxPoint( m_currentRect.x-wxIPE_ADJUST, m_currentRect.y-wxIPE_ADJUST ),
                                       wxSize( m_currentRect.width+wxIPE_ADJUST*2, m_currentRect.height+wxIPE_ADJUST*2 ),
                                       wxNO_BORDER | wxTE_PROCESS_ENTER );
                                       wxPoint( m_currentRect.x-wxIPE_ADJUST, m_currentRect.y-wxIPE_ADJUST ),
                                       wxSize( m_currentRect.width+wxIPE_ADJUST*2, m_currentRect.height+wxIPE_ADJUST*2 ),
                                       wxNO_BORDER | wxTE_PROCESS_ENTER );


@@ -1477,7 +1477,7 @@ void wxGenericGrid::OnSelectCellImplementation(wxDC *dc, int row, int col)
   if (cell)
   {
         if ( cell->GetTextValue().IsNull() )
   if (cell)
   {
         if ( cell->GetTextValue().IsNull() )

-                m_textItem->SetValue("");
+                m_textItem->SetValue(wxT(""));

         else
             m_textItem->SetValue(cell->GetTextValue());
   }
         else
             m_textItem->SetValue(cell->GetTextValue());
   }


@@ -1518,7 +1518,7 @@ void wxGenericGrid::OnSelectCellImplementation(wxDC *dc, int row, int col)
           m_inPlaceTextItem->SetForegroundColour(cell->GetTextColour());
 
           if ( cell->GetTextValue().IsNull() ) {
           m_inPlaceTextItem->SetForegroundColour(cell->GetTextColour());
 
           if ( cell->GetTextValue().IsNull() ) {

-              m_inPlaceTextItem->SetValue( "" );
+              m_inPlaceTextItem->SetValue( wxT("") );

           }
           else {
               m_inPlaceTextItem->SetValue( cell->GetTextValue() );
           }
           else {
               m_inPlaceTextItem->SetValue( cell->GetTextValue() );


@@ -1538,7 +1538,7 @@ void wxGenericGrid::OnSelectCellImplementation(wxDC *dc, int row, int col)
           HighlightCell(dc, TRUE);
 #endif
     }
           HighlightCell(dc, TRUE);
 #endif
     }

-  else
+  else if (!wxIPE_HIGHLIGHT)

     {
       // 1) Why isn't this needed for Windows??
       // Probably because of the SetValue?? JS.
     {
       // 1) Why isn't this needed for Windows??
       // Probably because of the SetValue?? JS.


@@ -1547,10 +1547,11 @@ void wxGenericGrid::OnSelectCellImplementation(wxDC *dc, int row, int col)
       //
       // 3) It *is* needed for Motif - michael
       //
       //
       // 3) It *is* needed for Motif - michael
       //

-#if defined(__WXMOTIF__)
-      if ((wxIPE_HIGHLIGHT || !(m_editable && m_editInPlace)))
+      // 4) It *seems* to be needed whenever
+      //    wxIPE_HIGHLIGHT is not set (i.e.
+      //    for both wxGTK and wxMOTIF)... SN.
+      if (!(m_editable && m_editInPlace)))

           HighlightCell(dc, TRUE);
           HighlightCell(dc, TRUE);

-#endif

     }
 
   dc->DestroyClippingRegion();
     }
 
   dc->DestroyClippingRegion();


@@ -1571,7 +1572,7 @@ void wxGenericGrid::OnChangeLabels()
   int i;
   for (i = 0; i < m_totalRows; i++)
   {
   int i;
   for (i = 0; i < m_totalRows; i++)
   {

-    sprintf(buf, "%d", i+1);
+    sprintf(buf, wxT("%d"), i+1);

     SetLabelValue(wxVERTICAL, buf, i);
   }
   // A...Z,AA...ZZ,AAA...ZZZ, etc.
     SetLabelValue(wxVERTICAL, buf, i);
   }
   // A...Z,AA...ZZ,AAA...ZZZ, etc.


@@ -1584,7 +1585,7 @@ void wxGenericGrid::OnChangeLabels()
     for (j = 0; j < noTimes; j++)
     {
       char buf2[20];
     for (j = 0; j < noTimes; j++)
     {
       char buf2[20];

-      sprintf(buf2, "%c", (char)ch);
+      sprintf(buf2, wxT("%c"), (char)ch);

       strcat(buf, buf2);
     }
     SetLabelValue(wxHORIZONTAL, buf, i);
       strcat(buf, buf2);
     }
     SetLabelValue(wxHORIZONTAL, buf, i);


@@ -1665,7 +1666,7 @@ void wxGenericGrid::DrawCellText()
   rect.height -= 4;
 
   // FIXME: what's this string of spaces supposed to represent?
   rect.height -= 4;
 
   // FIXME: what's this string of spaces supposed to represent?

-  DrawTextRect(& dc, "                                    ", &rect, wxLEFT);
+  DrawTextRect(& dc, wxT("                                    "), &rect, wxLEFT);

   DrawTextRect(& dc, editValue, &rect, cell->GetAlignment());
 
   dc.DestroyClippingRegion();
   DrawTextRect(& dc, editValue, &rect, cell->GetAlignment());
 
   dc.DestroyClippingRegion();


@@ -1961,7 +1962,7 @@ void wxGenericGrid::RefreshCell(int row, int col, bool setText)
 
 wxString& wxGenericGrid::GetCellValue(int row, int col) const
 {
 
 wxString& wxGenericGrid::GetCellValue(int row, int col) const
 {

-  static wxString emptyString("");
+  static wxString emptyString(wxT(""));

 
   wxGridCell *cell = GetCell(row, col);
   if (cell)
 
   wxGridCell *cell = GetCell(row, col);
   if (cell)


@@ -2043,7 +2044,7 @@ void wxGenericGrid::SetLabelValue(int orientation, const wxString& val, int pos)
 
 wxString& wxGenericGrid::GetLabelValue(int orientation, int pos) const
 {
 
 wxString& wxGenericGrid::GetLabelValue(int orientation, int pos) const
 {

- static wxString emptyString = "";
+  static wxString emptyString = wxT("");

   wxGridCell *cell = GetLabelCell(orientation, pos);
   if (cell)
     return cell->GetTextValue();
   wxGridCell *cell = GetLabelCell(orientation, pos);
   if (cell)
     return cell->GetTextValue();


@@ -2160,7 +2161,7 @@ void wxGenericGrid::SetEditInPlace(bool edit)
                   m_inPlaceTextItem->SetForegroundColour(cell->GetTextColour());
 
                   if ( cell->GetTextValue().IsNull() ) {
                   m_inPlaceTextItem->SetForegroundColour(cell->GetTextColour());
 
                   if ( cell->GetTextValue().IsNull() ) {

-                      m_inPlaceTextItem->SetValue( "" );
+                      m_inPlaceTextItem->SetValue( wxT("") );

                   }
                   else {
                       m_inPlaceTextItem->SetValue( cell->GetTextValue() );
                   }
                   else {
                       m_inPlaceTextItem->SetValue( cell->GetTextValue() );


@@ -2854,4 +2855,4 @@ void *wxGenericGrid::GetCellData(int row, int col)
     return rc;
 }
 
     return rc;
 }
 

-#endif // wxUSE_GRID
+#endif // wxUSE_GRID && !(wxUSE_NEW_GRID)