Compilation fixes for old SDKs (VC6) after recent commit.

[wxWidgets.git] / src / propgrid / editors.cpp

diff --git a/src/propgrid/editors.cpp b/src/propgrid/editors.cpp
index 9ac08888ab2861f5c04d16af603508ec6a4067b8..e22b3760182652f3c598fccd10a7a66a661cae5c 100644 (file)
--- a/src/propgrid/editors.cpp
+++ b/src/propgrid/editors.cpp
@@ -6,7 +6,7 @@
 // Created:     2007-04-14
 // RCS-ID:      $Id$
 // Copyright:   (c) Jaakko Salli
 // Created:     2007-04-14
 // RCS-ID:      $Id$
 // Copyright:   (c) Jaakko Salli

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".


@@ -848,6 +848,10 @@ void wxPropertyGrid::OnComboItemPaint( const wxPGComboBox* pCb,
         else
         {
             renderFlags |= wxPGCellRenderer::ChoicePopup;
         else
         {
             renderFlags |= wxPGCellRenderer::ChoicePopup;

+
+            // For consistency, always use normal font when drawing drop down
+            // items
+            dc.SetFont(GetFont());

         }
 
         // If not drawing a selected popup item, then give property's
         }
 
         // If not drawing a selected popup item, then give property's


@@ -1400,12 +1404,12 @@ const int wxSCB_SETVALUE_CYCLE = 2;
 
 
 static void DrawSimpleCheckBox( wxDC& dc, const wxRect& rect, int box_hei,
 
 
 static void DrawSimpleCheckBox( wxDC& dc, const wxRect& rect, int box_hei,

-                                int state, const wxColour& lineCol )
+                                int state )

 {
     // Box rectangle.
     wxRect r(rect.x+wxPG_XBEFORETEXT,rect.y+((rect.height-box_hei)/2),
              box_hei,box_hei);
 {
     // Box rectangle.
     wxRect r(rect.x+wxPG_XBEFORETEXT,rect.y+((rect.height-box_hei)/2),
              box_hei,box_hei);

-    wxColour useCol = lineCol;
+    wxColour useCol = dc.GetTextForeground();

 
     if ( state & wxSCB_STATE_UNSPECIFIED )
     {
 
     if ( state & wxSCB_STATE_UNSPECIFIED )
     {


@@ -1508,8 +1512,7 @@ END_EVENT_TABLE()
 
 wxSimpleCheckBox::~wxSimpleCheckBox()
 {
 
 wxSimpleCheckBox::~wxSimpleCheckBox()
 {

-    delete ms_doubleBuffer;
-    ms_doubleBuffer = NULL;
+    wxDELETE(ms_doubleBuffer);

 }
 
 wxBitmap* wxSimpleCheckBox::ms_doubleBuffer = NULL;
 }
 
 wxBitmap* wxSimpleCheckBox::ms_doubleBuffer = NULL;


@@ -1529,14 +1532,14 @@ void wxSimpleCheckBox::OnPaint( wxPaintEvent& WXUNUSED(event) )
     dc.SetPen( bgcol );
     dc.DrawRectangle( rect );
 
     dc.SetPen( bgcol );
     dc.DrawRectangle( rect );
 

-    wxColour txcol = GetForegroundColour();
+    dc.SetTextForeground(GetForegroundColour());

 
     int state = m_state;
     if ( !(state & wxSCB_STATE_UNSPECIFIED) &&
          GetFont().GetWeight() == wxBOLD )
         state |= wxSCB_STATE_BOLD;
 
 
     int state = m_state;
     if ( !(state & wxSCB_STATE_UNSPECIFIED) &&
          GetFont().GetWeight() == wxBOLD )
         state |= wxSCB_STATE_BOLD;
 

-    DrawSimpleCheckBox(dc,rect,m_boxHeight,state,txcol);
+    DrawSimpleCheckBox(dc, rect, m_boxHeight, state);

 }
 
 void wxSimpleCheckBox::OnLeftClick( wxMouseEvent& event )
 }
 
 void wxSimpleCheckBox::OnLeftClick( wxMouseEvent& event )


@@ -1629,7 +1632,6 @@ void wxPGCheckBoxEditor::DrawValue( wxDC& dc, const wxRect& rect,
                                     const wxString& WXUNUSED(text) ) const
 {
     int state = wxSCB_STATE_UNCHECKED;
                                     const wxString& WXUNUSED(text) ) const
 {
     int state = wxSCB_STATE_UNCHECKED;

-    wxColour rectCol = dc.GetTextForeground();

 
     if ( !property->IsValueUnspecified() )
     {
 
     if ( !property->IsValueUnspecified() )
     {


@@ -1642,7 +1644,7 @@ void wxPGCheckBoxEditor::DrawValue( wxDC& dc, const wxRect& rect,
         state |= wxSCB_STATE_UNSPECIFIED;
     }
 
         state |= wxSCB_STATE_UNSPECIFIED;
     }
 

-    DrawSimpleCheckBox(dc, rect, dc.GetCharHeight(), state, rectCol);
+    DrawSimpleCheckBox(dc, rect, dc.GetCharHeight(), state);

 }
 
 void wxPGCheckBoxEditor::UpdateControl( wxPGProperty* property,
 }
 
 void wxPGCheckBoxEditor::UpdateControl( wxPGProperty* property,


@@ -1728,8 +1730,10 @@ wxWindow* wxPropertyGrid::GetEditorControl() const
 void wxPropertyGrid::CorrectEditorWidgetSizeX()
 {
     int secWid = 0;
 void wxPropertyGrid::CorrectEditorWidgetSizeX()
 {
     int secWid = 0;

-    int newSplitterx = m_pState->DoGetSplitterPosition(m_selColumn-1);
-    int newWidth = newSplitterx + m_pState->m_colWidths[m_selColumn];
+
+    // Use fixed selColumn 1 for main editor widgets
+    int newSplitterx = m_pState->DoGetSplitterPosition(0);
+    int newWidth = newSplitterx + m_pState->m_colWidths[1];

 
     if ( m_wndEditor2 )
     {
 
     if ( m_wndEditor2 )
     {


@@ -1769,25 +1773,41 @@ void wxPropertyGrid::CorrectEditorWidgetSizeX()
 
 void wxPropertyGrid::CorrectEditorWidgetPosY()
 {
 
 void wxPropertyGrid::CorrectEditorWidgetPosY()
 {

-    if ( GetSelection() && (m_wndEditor || m_wndEditor2) )
-    {
-        wxRect r = GetEditorWidgetRect(GetSelection(), m_selColumn);
+    wxPGProperty* selected = GetSelection();

 
 

-        if ( m_wndEditor )
+    if ( selected )
+    {
+        if ( m_labelEditor )

         {
         {

-            wxPoint pos = m_wndEditor->GetPosition();
+            wxRect r = GetEditorWidgetRect(selected, m_selColumn);
+            wxPoint pos = m_labelEditor->GetPosition();

 
             // Calculate y offset
             int offset = pos.y % m_lineHeight;
 
 
             // Calculate y offset
             int offset = pos.y % m_lineHeight;
 

-            m_wndEditor->Move(pos.x, r.y + offset);
+            m_labelEditor->Move(pos.x, r.y + offset);

         }
 
         }
 

-        if ( m_wndEditor2 )
+        if ( m_wndEditor || m_wndEditor2 ) 

         {
         {

-            wxPoint pos = m_wndEditor2->GetPosition();
+            wxRect r = GetEditorWidgetRect(selected, 1);
+
+            if ( m_wndEditor )
+            {
+                wxPoint pos = m_wndEditor->GetPosition();

 
 

-            m_wndEditor2->Move(pos.x, r.y);
+                // Calculate y offset
+                int offset = pos.y % m_lineHeight;
+
+                m_wndEditor->Move(pos.x, r.y + offset);
+            }
+
+            if ( m_wndEditor2 )
+            {
+                wxPoint pos = m_wndEditor2->GetPosition();
+
+                m_wndEditor2->Move(pos.x, r.y);
+            }

         }
     }
 }
         }
     }
 }


@@ -1898,6 +1918,13 @@ wxWindow* wxPropertyGrid::GenerateEditorTextCtrl( const wxPoint& pos,
     }
 #endif
 
     }
 #endif
 

+    // This code is repeated from DoSelectProperty(). However, font boldness
+    // must be set before margin is set up below in FixPosForTextCtrl().
+    if ( forColumn == 1 &&
+         prop->HasFlag(wxPG_PROP_MODIFIED) &&
+         HasFlag(wxPG_BOLD_MODIFIED) )
+         tc->SetFont( m_captionFont );
+

     // Center the control vertically
     if ( !hasSpecialSize )
         FixPosForTextCtrl(tc, forColumn);
     // Center the control vertically
     if ( !hasSpecialSize )
         FixPosForTextCtrl(tc, forColumn);