Changeset 9862 for ps

Timestamp:

07/17/11 19:30:07 (13 years ago)

Author:

philip

Message:

Fix "hides overloaded virtual function" warnings in Clang

Location:

ps/trunk/source/gui

Files:

• CButton.cpp (modified) (1 diff)
• CCheckBox.cpp (modified) (1 diff)
• CDropDown.cpp (modified) (1 diff)
• CList.cpp (modified) (1 diff)
• CText.cpp (modified) (1 diff)
• CTooltip.cpp (modified) (1 diff)
• IGUIObject.h (modified) (1 diff)
• IGUITextOwner.cpp (modified) (1 diff)
• IGUITextOwner.h (modified) (1 diff)

ps/trunk/source/gui/CButton.cpp

@@ -117 +117 @@
 
     CColor color = ChooseColor();
-    IGUITextOwner::Draw(0, color, m_TextPos, bz+0.1f);
+    DrawText(0, color, m_TextPos, bz+0.1f);
 }

ps/trunk/source/gui/CCheckBox.cpp

@@ -176 +176 @@
         text_pos.y += square_side/2.f - line_height/2.f;
 
-    IGUITextOwner::Draw(0, color, text_pos, bz+0.1f, m_CachedActualSize);
+    DrawText(0, color, text_pos, bz+0.1f, m_CachedActualSize);
 }

ps/trunk/source/gui/CDropDown.cpp

@@ -338 +338 @@
 
         CPos pos(m_CachedActualSize.left, m_CachedActualSize.top);
-        IGUITextOwner::Draw(selected, color, pos, bz+0.1f, cliparea);
+        DrawText(selected, color, pos, bz+0.1f, cliparea);
     }
 

ps/trunk/source/gui/CList.cpp

@@ -402 +402 @@
             }
 
-            IGUITextOwner::Draw(i, color, rect.TopLeft() - CPos(0.f, scroll - m_ItemsYPositions[i]), 
-                                bz+0.1f, cliparea);
+            DrawText(i, color, rect.TopLeft() - CPos(0.f, scroll - m_ItemsYPositions[i]), bz+0.1f, cliparea);
         }
     }

ps/trunk/source/gui/CText.cpp

@@ -245 +245 @@
         GUI<CColor>::GetSetting(this, "textcolor", color);
 
-        // Draw text
         if (scrollbar)
-            IGUITextOwner::Draw(0, color, m_CachedActualSize.TopLeft() - CPos(0.f, scroll), bz+0.1f, cliparea);
+            DrawText(0, color, m_CachedActualSize.TopLeft() - CPos(0.f, scroll), bz+0.1f, cliparea);
         else
-            IGUITextOwner::Draw(0, color, m_TextPos, bz+0.1f, cliparea);
+            DrawText(0, color, m_TextPos, bz+0.1f, cliparea);
     }
 }

ps/trunk/source/gui/CTooltip.cpp

@@ -161 +161 @@
         GUI<CColor>::GetSetting(this, "textcolor", color);
 
-        // Draw text
-        IGUITextOwner::Draw(0, color, m_CachedActualSize.TopLeft(), z+0.1f);
+        DrawText(0, color, m_CachedActualSize.TopLeft(), z+0.1f);
     }
 }

ps/trunk/source/gui/IGUIObject.h

@@ -584 +584 @@
 public:
 
-    virtual void HandleMessage(const SGUIMessage& UNUSED(Message)) {}
     virtual void Draw() {}
     // Empty can never be hovered. It is only a category.

ps/trunk/source/gui/IGUITextOwner.cpp

@@ -79 +79 @@
 }
 
-void IGUITextOwner::Draw(const int &index, const CColor &color, const CPos &pos,
-                         const float &z, const CRect &clipping)
+void IGUITextOwner::DrawText(int index, const CColor& color, const CPos& pos, float z, const CRect& clipping)
 {
     if (!m_GeneratedTextsValid)

ps/trunk/source/gui/IGUITextOwner.h

@@ -89 +89 @@
      *        to get no clipping.
      */
-    virtual void Draw(const int &index, const CColor &color, const CPos &pos, 
-                      const float &z, const CRect &clipping = CRect());
+    virtual void DrawText(int index, const CColor& color, const CPos& pos, float z, const CRect& clipping = CRect());
 
     /**