Ticket #885: faster-0ad-gui.patch

source/gui/GUITooltip.cpp

@@ -168 +168 @@
 
         // Unhide the object. (If it had use_object and hide_object="true",
         // still unhide it, because the used object might be hidden by default)
-        GUI<bool>::SetSetting(usedobj, "hidden", false);
+//      GUI<bool>::SetSetting(usedobj, "hidden", false);
+        usedobj->SetHidden(false);
     }
     else
     {
         // Unhide the object
-        GUI<bool>::SetSetting(usedobj, "hidden", false);
+//      GUI<bool>::SetSetting(usedobj, "hidden", false);
+        usedobj->SetHidden(false);
 
         // Store mouse position inside the CTooltip
         if (GUI<CPos>::SetSetting(usedobj, "_mousepos", pos) != PSRETURN_OK)
@@ -241 +243 @@
 
         // If hide_object was enabled, hide it
         if (hideobject)
-            GUI<bool>::SetSetting(usedobj, "hidden", true);
+        {
+//          GUI<bool>::SetSetting(usedobj, "hidden", true);
+            usedobj->SetHidden(true);
+        }
+            
     }
     else
     {
-        GUI<bool>::SetSetting(tooltipobj, "hidden", true);
+//      GUI<bool>::SetSetting(tooltipobj, "hidden", true);
+        tooltipobj->SetHidden(true);
     }
 
 }

source/gui/CInput.cpp

@@ -41 +41 @@
 //-------------------------------------------------------------------
 CInput::CInput() : m_iBufferPos(-1), m_iBufferPos_Tail(-1), m_SelectingText(false), m_HorizontalScroll(0.f)
 {
-    AddSetting(GUIST_float,                 "buffer_zone");
-    AddSetting(GUIST_CStrW,                 "caption");
-    AddSetting(GUIST_int,                   "cell_id");
-    AddSetting(GUIST_CStrW,                 "font");
-    AddSetting(GUIST_int,                   "max_length");
-    AddSetting(GUIST_bool,                  "multiline");
-    AddSetting(GUIST_bool,                  "scrollbar");
-    AddSetting(GUIST_CStr,                  "scrollbar_style");
-    AddSetting(GUIST_CGUISpriteInstance,    "sprite");
-    AddSetting(GUIST_CGUISpriteInstance,    "sprite_selectarea");
-    AddSetting(GUIST_CColor,                "textcolor");
-    AddSetting(GUIST_CColor,                "textcolor_selected");
-    AddSetting(GUIST_CStrW,                 "tooltip");
-    AddSetting(GUIST_CStr,                  "tooltip_style");
+    AddSetting(GUIST_float,                 "buffer_zone",          &m_BufferZone);
+    AddSetting(GUIST_CStrW,                 "caption",              &m_Caption);
+    AddSetting(GUIST_int,                   "cell_id",              &m_CellId);
+    AddSetting(GUIST_CStrW,                 "font",                 &m_Font);
+    AddSetting(GUIST_int,                   "max_length",           &m_MaxLength);
+    AddSetting(GUIST_bool,                  "multiline",            &m_Multiline);
+    AddSetting(GUIST_bool,                  "scrollbar",            &m_Scrollbar);
+    AddSetting(GUIST_CStr,                  "scrollbar_style",      &m_ScrollbarStyle);
+    AddSetting(GUIST_CGUISpriteInstance,    "sprite",               &m_Sprite);
+    AddSetting(GUIST_CGUISpriteInstance,    "sprite_selectarea",    &m_SpriteSelectArea);
+    AddSetting(GUIST_CColor,                "textcolor",            &m_TextColor);
+    AddSetting(GUIST_CColor,                "textcolor_selected",   &m_TextColorSelected);
+    AddSetting(GUIST_CStrW,                 "tooltip",              &m_Tooltip);
+    AddSetting(GUIST_CStr,                  "tooltip_style",        &m_TooltipStyle);
 
+    m_BufferZone = 0.f;
+    m_Font = L"";
+
     // Add scroll-bar
     CGUIScrollBarVertical * bar = new CGUIScrollBarVertical();
     bar->SetRightAligned(true);
@@ -80 +83 @@
         // Since the GUI framework doesn't handle to set settings
         //  in Unicode (CStrW), we'll simply retrieve the actual
         //  pointer and edit that.
-        CStrW *pCaption = (CStrW*)m_Settings["caption"].m_pSetting;
         bool shiftKeyPressed = g_keys[SDLK_RSHIFT] || g_keys[SDLK_LSHIFT];
 
         int szChar = ev->ev.key.keysym.sym;
@@ -102 +104 @@
                 {
                     m_iBufferPos_Tail = -1;
 
-                    if (pCaption->empty() || m_iBufferPos == 0)
+                    if (m_Caption.empty() || m_iBufferPos == 0)
                     {
                         break;
                     }
                     else
                     {
-                        if (m_iBufferPos == (int)pCaption->length())
-                            *pCaption = pCaption->Left( (long) pCaption->length()-1);
+                        if (m_iBufferPos == (int)m_Caption.length())
+                            m_Caption = m_Caption.Left( (long) m_Caption.length()-1);
                         else
-                            *pCaption = pCaption->Left( m_iBufferPos-1 ) + 
-                                        pCaption->Right( (long) pCaption->length()-m_iBufferPos );
+                            m_Caption = m_Caption.Left( m_iBufferPos-1 ) +
+                                        m_Caption.Right( (long) m_Caption.length()-m_iBufferPos );
 
                         --m_iBufferPos;
-                    
+
                         UpdateText(m_iBufferPos, m_iBufferPos+1, m_iBufferPos);
                     }
                 }
@@ -132 +134 @@
                 }
                 else
                 {
-                    if (pCaption->empty() || m_iBufferPos == (int)pCaption->length())
+                    if (m_Caption.empty() || m_iBufferPos == (int)m_Caption.length())
                     {
                         break;
                     }
                     else
                     {
-                        *pCaption = pCaption->Left( m_iBufferPos ) + 
-                                    pCaption->Right( (long) pCaption->length()-(m_iBufferPos+1) );
+                        m_Caption = m_Caption.Left( m_iBufferPos ) +
+                                    m_Caption.Right( (long) m_Caption.length()-(m_iBufferPos+1) );
 
                         UpdateText(m_iBufferPos, m_iBufferPos+1, m_iBufferPos);
                     }
@@ -180 +182 @@
                     m_iBufferPos_Tail = m_iBufferPos;
                 }
 
-                m_iBufferPos = (long) pCaption->length();
+                m_iBufferPos = (long) m_Caption.length();
                 m_WantedX=0.0f;
 
                 UpdateAutoScroll();
@@ -222 +224 @@
                         m_iBufferPos_Tail = m_iBufferPos;
                     }
 
-                    if (m_iBufferPos > 0) 
+                    if (m_iBufferPos > 0)
                         --m_iBufferPos;
                 }
                 else
@@ -250 +252 @@
                         m_iBufferPos_Tail = m_iBufferPos;
                     }
 
-                    if (m_iBufferPos < (int)pCaption->length())
+                    if (m_iBufferPos < (int)m_Caption.length())
                         ++m_iBufferPos;
                 }
                 else
@@ -259 +261 @@
                         m_iBufferPos = m_iBufferPos_Tail;
 
                     m_iBufferPos_Tail = -1;
-                }           
+                }
 
                 UpdateAutoScroll();
                 break;
@@ -301 +303 @@
                     if (m_iBufferPos >= current->m_ListStart &&
                         m_iBufferPos <= current->m_ListStart+(int)current->m_ListOfX.size())
                         break;
-                    
+
                     ++current;
                 }
 
@@ -324 +326 @@
                     m_iBufferPos = current->m_ListStart + GetXTextPosition(current, pos_x, m_WantedX);
                 }
                 // else we can't move up
-                
+
                 UpdateAutoScroll();
             }
                 break;
@@ -346 +348 @@
                     if (m_iBufferPos >= current->m_ListStart &&
                         m_iBufferPos <= current->m_ListStart+(int)current->m_ListOfX.size())
                         break;
-                    
+
                     ++current;
                 }
 
@@ -387 +389 @@
                 // 'Return' should do a Press event for single liners (e.g. submitting forms)
                 //  otherwise a '\n' character will be added.
                 {
-                bool multiline;
-                GUI<bool>::GetSetting(this, "multiline", multiline);
-                if (!multiline)
+                if (!m_Multiline)
                 {
                     SendEvent(GUIM_PRESSED, "press");
                     break;
@@ -404 +404 @@
                     return IN_PASS; // Important, because we didn't use any key
 
                 // check max length
-                int max_length;
-                GUI<int>::GetSetting(this, "max_length", max_length);
-                if (max_length != 0 && (int)pCaption->length() >= max_length)
+                if (m_MaxLength != 0 && (int)m_Caption.length() >= m_MaxLength)
                     break;
 
                 m_WantedX=0.0f;
@@ -415 +413 @@
                     DeleteCurSelection();
                 m_iBufferPos_Tail = -1;
 
-                if (m_iBufferPos == (int)pCaption->length())
-                    *pCaption += cooked;
+                if (m_iBufferPos == (int)m_Caption.length())
+                    m_Caption += cooked;
                 else
-                    *pCaption = pCaption->Left(m_iBufferPos) + cooked +
-                                pCaption->Right((long) pCaption->length()-m_iBufferPos);
+                    m_Caption = m_Caption.Left(m_iBufferPos) + cooked +
+                                m_Caption.Right((long) m_Caption.length()-m_iBufferPos);
 
                 UpdateText(m_iBufferPos, m_iBufferPos, m_iBufferPos+1);
 
@@ -439 +437 @@
 
 InReaction CInput::ManuallyHandleHotkeyEvent(const SDL_Event_* ev)
 {
-    CStrW *pCaption = (CStrW*)m_Settings["caption"].m_pSetting;
     bool shiftKeyPressed = g_keys[SDLK_RSHIFT] || g_keys[SDLK_LSHIFT];
 
     std::string hotkey = static_cast<const char*>(ev->ev.user.data1);
@@ -455 +452 @@
                 DeleteCurSelection();
             }
 
-            if (m_iBufferPos == (int)pCaption->length())
-                *pCaption += text;
+            if (m_iBufferPos == (int)m_Caption.length())
+                m_Caption += text;
             else
-                *pCaption = pCaption->Left(m_iBufferPos) + text + 
-                pCaption->Right((long) pCaption->length()-m_iBufferPos);
+                m_Caption = m_Caption.Left(m_iBufferPos) + text +
+                m_Caption.Right((long) m_Caption.length()-m_iBufferPos);
 
             UpdateText(m_iBufferPos, m_iBufferPos, m_iBufferPos+1);
 
@@ -490 +487 @@
                 virtualTo = m_iBufferPos;
             }
 
-            CStrW text = (pCaption->Left(virtualTo)).Right(virtualTo - virtualFrom);
+            CStrW text = (m_Caption.Left(virtualTo)).Right(virtualTo - virtualFrom);
 
             sys_clipboard_set(&text[0]);
 
@@ -510 +507 @@
         {
             DeleteCurSelection();
         }
-        if (!pCaption->empty() && !m_iBufferPos == 0)
+        if (!m_Caption.empty() && !m_iBufferPos == 0)
         {
             m_iBufferPos_Tail = m_iBufferPos;
-            CStrW searchString = pCaption->Left( m_iBufferPos );
+            CStrW searchString = m_Caption.Left( m_iBufferPos );
 
             // If we are starting in whitespace, adjust position until we get a non whitespace
             while (m_iBufferPos > 0)
@@ -523 +520 @@
 
                 m_iBufferPos--;
             }
-                
+
             // If we end up on a puctuation char we just delete it (treat punct like a word)
             if (iswpunct(searchString[m_iBufferPos - 1]))
                 m_iBufferPos--;
@@ -542 +539 @@
             DeleteCurSelection();
         }
         return IN_HANDLED;
-    } 
+    }
     else if (hotkey == "text.delete.right")
     {
         m_WantedX=0.0f;
@@ -551 +548 @@
         {
             DeleteCurSelection();
         }
-        if (!pCaption->empty() && m_iBufferPos < (int)pCaption->length())
+        if (!m_Caption.empty() && m_iBufferPos < (int)m_Caption.length())
         {
             // Delete the word to the right of the cursor
             m_iBufferPos_Tail = m_iBufferPos;
 
             // Delete chars to the right unit we hit whitespace
-            while (++m_iBufferPos < (int)pCaption->length())
+            while (++m_iBufferPos < (int)m_Caption.length())
             {
-                if (iswspace((*pCaption)[m_iBufferPos]) || iswpunct((*pCaption)[m_iBufferPos]))
+                if (iswspace(m_Caption[m_iBufferPos]) || iswpunct(m_Caption[m_iBufferPos]))
                     break;
             }
 
             // Eliminate any whitespace behind the word we just deleted
-            while (m_iBufferPos < (int)pCaption->length())
+            while (m_iBufferPos < (int)m_Caption.length())
             {
-                if (!iswspace((*pCaption)[m_iBufferPos]))
+                if (!iswspace(m_Caption[m_iBufferPos]))
                     break;
 
                 m_iBufferPos++;
             }
             DeleteCurSelection();
         }
-        return IN_HANDLED;          
+        return IN_HANDLED;
     }
     else if (hotkey == "text.move.left")
     {
         m_WantedX=0.0f;
-                
+
         if (shiftKeyPressed || !SelectingText())
         {
             if (!shiftKeyPressed)
@@ -590 +587 @@
                 m_iBufferPos_Tail = m_iBufferPos;
             }
 
-            if (!pCaption->empty() && !m_iBufferPos == 0)
+            if (!m_Caption.empty() && !m_iBufferPos == 0)
             {
-                CStrW searchString = pCaption->Left( m_iBufferPos );
+                CStrW searchString = m_Caption.Left( m_iBufferPos );
 
                 // If we are starting in whitespace, adjust position until we get a non whitespace
                 while (m_iBufferPos > 0)
@@ -602 +599 @@
 
                     m_iBufferPos--;
                 }
-                
+
                 // If we end up on a puctuation char we just select it (treat punct like a word)
                 if (iswpunct(searchString[m_iBufferPos - 1]))
                     m_iBufferPos--;
@@ -646 +643 @@
                 m_iBufferPos_Tail = m_iBufferPos;
             }
 
-            if (!pCaption->empty() && m_iBufferPos < (int)pCaption->length())
+            if (!m_Caption.empty() && m_iBufferPos < (int)m_Caption.length())
             {
-                CStrW searchString = *pCaption;
-
                 // Select chars to the right until we hit whitespace
-                while (++m_iBufferPos < (int)pCaption->length())
+                while (++m_iBufferPos < (int)m_Caption.length())
                 {
-                    if (iswspace((*pCaption)[m_iBufferPos]) || iswpunct((*pCaption)[m_iBufferPos]))
+                    if (iswspace(m_Caption[m_iBufferPos]) || iswpunct(m_Caption[m_iBufferPos]))
                         break;
                 }
 
                 // Also select any whitespace following the word we just selected
-                while (m_iBufferPos < (int)pCaption->length())
+                while (m_iBufferPos < (int)m_Caption.length())
                 {
-                    if (!iswspace((*pCaption)[m_iBufferPos]))
+                    if (!iswspace(m_Caption[m_iBufferPos]))
                         break;
 
                     m_iBufferPos++;
@@ -673 +668 @@
                 m_iBufferPos = m_iBufferPos_Tail;
 
             m_iBufferPos_Tail = -1;
-        }           
+        }
 
         UpdateAutoScroll();
 
@@ -695 +690 @@
     {
     case GUIM_SETTINGS_UPDATED:
         {
-        bool scrollbar;
-        GUI<bool>::GetSetting(this, "scrollbar", scrollbar);
-
         // Update scroll-bar
         // TODO Gee: (2004-09-01) Is this really updated each time it should?
-        if (scrollbar && 
-            (Message.value == CStr("size") || 
+        if (m_Scrollbar &&
+            (Message.value == CStr("size") ||
              Message.value == CStr("z") ||
              Message.value == CStr("absolute")))
-        {       
+        {
             GetScrollBar(0).SetX(m_CachedActualSize.right);
             GetScrollBar(0).SetY(m_CachedActualSize.top);
             GetScrollBar(0).SetZ(GetBufferedZ());
@@ -714 +706 @@
         // Update scrollbar
         if (Message.value == CStr("scrollbar_style"))
         {
-            CStr scrollbar_style;
-            GUI<CStr>::GetSetting(this, Message.value, scrollbar_style);
-
-            GetScrollBar(0).SetScrollBarStyle(scrollbar_style);
+            GetScrollBar(0).SetScrollBarStyle(m_ScrollbarStyle);
         }
 
-        if (Message.value == CStr("size") || 
+        if (Message.value == CStr("size") ||
             Message.value == CStr("z") ||
-            Message.value == CStr("font") || 
+            Message.value == CStr("font") ||
             Message.value == CStr("absolute") ||
             Message.value == CStr("caption") ||
             Message.value == CStr("scrollbar") ||
@@ -733 +722 @@
 
         if (Message.value == CStr("multiline"))
         {
-            bool multiline;
-            GUI<bool>::GetSetting(this, "multiline", multiline);
-
-            if (multiline == false)
+            if (!m_Multiline)
             {
                 GetScrollBar(0).SetLength(0.f);
             }
@@ -747 +733 @@
 
             UpdateText();
         }
-        
+
         }break;
 
     case GUIM_MOUSE_PRESS_LEFT:
         // Check if we're selecting the scrollbar:
         {
-        bool scrollbar, multiline;
-        GUI<bool>::GetSetting(this, "scrollbar", scrollbar);
-        GUI<bool>::GetSetting(this, "multiline", multiline);
-
-        if (GetScrollBar(0).GetStyle() && multiline)
+        if (GetScrollBar(0).GetStyle() && m_Multiline)
         {
             if (GetMousePos().x > m_CachedActualSize.right - GetScrollBar(0).GetStyle()->m_Width)
                 break;
@@ -778 +760 @@
         }
 
         m_SelectingText = true;
-        
+
         UpdateAutoScroll();
 
         // If we immediately release the button it will just be seen as a click
@@ -788 +770 @@
 
     case GUIM_MOUSE_DBLCLICK_LEFT:
         {
-            CStrW *pCaption = (CStrW*)m_Settings["caption"].m_pSetting;
             m_iBufferPos = m_iBufferPos_Tail = GetMouseHoveringTextPosition();
 
             // See if we are clicking over whitespace
-            if (iswspace((*pCaption)[m_iBufferPos]))
+            if (iswspace(m_Caption[m_iBufferPos]))
             {
                 // see if we are in a section of whitespace greater than one character
-                if ((m_iBufferPos + 1 < (int) pCaption->length() && iswspace((*pCaption)[m_iBufferPos + 1])) ||
-                    (m_iBufferPos - 1 > 0 && iswspace((*pCaption)[m_iBufferPos - 1])))
+                if ((m_iBufferPos + 1 < (int) m_Caption.length() && iswspace(m_Caption[m_iBufferPos + 1])) ||
+                    (m_iBufferPos - 1 > 0 && iswspace(m_Caption[m_iBufferPos - 1])))
                 {
                     //
                     // We are clicking in an area with more than one whitespace character
@@ -806 +787 @@
                     // skip the whitespace
                     while (m_iBufferPos > 0)
                     {
-                        if (!iswspace((*pCaption)[m_iBufferPos - 1]))
+                        if (!iswspace(m_Caption[m_iBufferPos - 1]))
                             break;
 
                         m_iBufferPos--;
@@ -814 +795 @@
                     // now go until we hit white space or punctuation
                     while (m_iBufferPos > 0)
                     {
-                        if (iswspace((*pCaption)[m_iBufferPos - 1]))
+                        if (iswspace(m_Caption[m_iBufferPos - 1]))
                             break;
 
                         m_iBufferPos--;
 
-                        if (iswpunct((*pCaption)[m_iBufferPos]))
+                        if (iswpunct(m_Caption[m_iBufferPos]))
                             break;
                     }
 
                     // [2] Then the right
                     // go right until we are not in whitespace
-                    while (++m_iBufferPos_Tail < (int)pCaption->length())
+                    while (++m_iBufferPos_Tail < (int)m_Caption.length())
                     {
-                        if (!iswspace((*pCaption)[m_iBufferPos_Tail]))
+                        if (!iswspace(m_Caption[m_iBufferPos_Tail]))
                             break;
                     }
                     // now go to the right until we hit whitespace or punctuation
-                    while (++m_iBufferPos_Tail < (int)pCaption->length())
+                    while (++m_iBufferPos_Tail < (int)m_Caption.length())
                     {
-                        if (iswspace((*pCaption)[m_iBufferPos_Tail]) || iswpunct((*pCaption)[m_iBufferPos_Tail]))
+                        if (iswspace(m_Caption[m_iBufferPos_Tail]) || iswpunct(m_Caption[m_iBufferPos_Tail]))
                             break;
                     }
                 }
                 else
                 {
                     // single whitespace so select word to the right
-                    while (++m_iBufferPos_Tail < (int)pCaption->length())
+                    while (++m_iBufferPos_Tail < (int)m_Caption.length())
                     {
-                        if (!iswspace((*pCaption)[m_iBufferPos_Tail]))
+                        if (!iswspace(m_Caption[m_iBufferPos_Tail]))
                             break;
                     }
 
@@ -850 +831 @@
                     m_iBufferPos = m_iBufferPos_Tail;
 
                     // now go to the right until we hit whitespace or punctuation
-                    while (++m_iBufferPos_Tail < (int)pCaption->length())
+                    while (++m_iBufferPos_Tail < (int)m_Caption.length())
                     {
-                        if (iswspace((*pCaption)[m_iBufferPos_Tail]) || iswpunct((*pCaption)[m_iBufferPos_Tail]))
+                        if (iswspace(m_Caption[m_iBufferPos_Tail]) || iswpunct(m_Caption[m_iBufferPos_Tail]))
                             break;
                     }
                 }
@@ -863 +844 @@
                 // go until we hit white space or punctuation
                 while (m_iBufferPos > 0)
                 {
-                    if (iswspace((*pCaption)[m_iBufferPos - 1]))
+                    if (iswspace(m_Caption[m_iBufferPos - 1]))
                         break;
 
                     m_iBufferPos--;
 
-                    if (iswpunct((*pCaption)[m_iBufferPos]))
+                    if (iswpunct(m_Caption[m_iBufferPos]))
                         break;
                 }
                 // go to the right until we hit whitespace or punctuation
-                while (++m_iBufferPos_Tail < (int)pCaption->length())
+                while (++m_iBufferPos_Tail < (int)m_Caption.length())
                 {
-                    if (iswspace((*pCaption)[m_iBufferPos_Tail]) || iswpunct((*pCaption)[m_iBufferPos_Tail]))
+                    if (iswspace(m_Caption[m_iBufferPos_Tail]) || iswpunct(m_Caption[m_iBufferPos_Tail]))
                         break;
                 }
             }
@@ -929 +910 @@
         GetScrollBar(0).SetZ( GetBufferedZ() );
         GetScrollBar(0).SetLength( m_CachedActualSize.bottom - m_CachedActualSize.top );
 
-        CStr scrollbar_style;
-        GUI<CStr>::GetSetting(this, "scrollbar_style", scrollbar_style);
-        GetScrollBar(0).SetScrollBarStyle( scrollbar_style );
+        GetScrollBar(0).SetScrollBarStyle( m_ScrollbarStyle );
 
         UpdateText();
         }
@@ -939 +918 @@
 
     case GUIM_GOT_FOCUS:
         m_iBufferPos = 0;
-        
+
         break;
 
     case GUIM_LOST_FOCUS:
@@ -959 +938 @@
 
     IGUIObject::UpdateCachedSize();
 
-    bool scrollbar;
-    GUI<bool>::GetSetting(this, "scrollbar", scrollbar);
-    if (scrollbar)
+    if (m_Scrollbar)
     {
         GetScrollBar(0).SetX(m_CachedActualSize.right);
         GetScrollBar(0).SetY(m_CachedActualSize.top);
@@ -972 +949 @@
 
 void CInput::Draw()
 {
-    float bz = GetBufferedZ();
-
     // First call draw on ScrollBarOwner
-    bool scrollbar;
-    float buffer_zone;
-    bool multiline;
-    GUI<bool>::GetSetting(this, "scrollbar", scrollbar);
-    GUI<float>::GetSetting(this, "buffer_zone", buffer_zone);
-    GUI<bool>::GetSetting(this, "multiline", multiline);
-
-    if (scrollbar && multiline)
+    if (m_Scrollbar && m_Multiline)
     {
         // Draw scrollbar
         IGUIScrollBarOwner::Draw();
     }
 
     if (GetGUI())
-    {   
-        CStrW font_name;
-        CColor color, color_selected;
-        //CStrW caption;
-        GUI<CStrW>::GetSetting(this, "font", font_name);
-        GUI<CColor>::GetSetting(this, "textcolor", color);
-        GUI<CColor>::GetSetting(this, "textcolor_selected", color_selected);
-        
-        // Get pointer of caption, it might be very large, and we don't
-        //  want to copy it continuously.
-        CStrW *pCaption = (CStrW*)m_Settings["caption"].m_pSetting;
+    {
+        float bz = GetBufferedZ();
 
-        CGUISpriteInstance *sprite=NULL, *sprite_selectarea=NULL;
-        int cell_id;
-        
-        GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite", sprite);
-        GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite_selectarea", sprite_selectarea);
-    
-        GUI<int>::GetSetting(this, "cell_id", cell_id);
+        GetGUI()->DrawSprite(m_Sprite, m_CellId, bz, m_CachedActualSize);
 
-        GetGUI()->DrawSprite(*sprite, cell_id, bz, m_CachedActualSize);
-
         float scroll=0.f;
-        if (scrollbar && multiline)
+        if (m_Scrollbar && m_Multiline)
         {
             scroll = GetScrollBar(0).GetPos();
         }
@@ -1026 +977 @@
 
         glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 
-        CFont font(font_name);
+        CFont font(m_Font);
         font.Bind();
 
         glPushMatrix();
@@ -1036 +987 @@
 
         // First we'll figure out the clipping area, which is the cached actual size
         //  substracted by an optional scrollbar
-        if (scrollbar)
+        if (m_Scrollbar)
         {
             scroll = GetScrollBar(0).GetPos();
 
@@ -1052 +1003 @@
 
         if (cliparea != CRect())
         {
-            double eq[4][4] = 
-            { 
+            double eq[4][4] =
+            {
                 {  0.0,  1.0, 0.0, -cliparea.top },
                 {  1.0,  0.0, 0.0, -cliparea.left },
                 {  0.0, -1.0, 0.0, cliparea.bottom },
@@ -1087 +1038 @@
 
         // Set the Z to somewhat more, so we can draw a selected area between the
         //  the control and the text.
-        glTranslatef((GLfloat)int(m_CachedActualSize.left) + buffer_zone, 
-                     (GLfloat)int(m_CachedActualSize.top+h) + buffer_zone, bz+0.1f);
-        
+        glTranslatef((GLfloat)int(m_CachedActualSize.left) + m_BufferZone,
+                     (GLfloat)int(m_CachedActualSize.top+h) + m_BufferZone, bz+0.1f);
+
         //glColor4f(1.f, 1.f, 1.f, 1.f);
-        
+
         // U+FE33: PRESENTATION FORM FOR VERTICAL LOW LINE
         // (sort of like a | which is aligned to the left of most characters)
 
-        float buffered_y = -scroll+buffer_zone;
+        float buffered_y = -scroll+m_BufferZone;
 
         // When selecting larger areas, we need to draw a rectangle box
         //  around it, and this is to keep track of where the box
@@ -1143 +1094 @@
                 it != m_CharacterPositions.end();
                 ++it, buffered_y += ls, x_pointer = 0.f)
             {
-                if (multiline)
+                if (m_Multiline)
                 {
                     if (buffered_y > m_CachedActualSize.GetHeight())
                         break;
@@ -1156 +1107 @@
                     if (it->m_ListStart + i == VirtualFrom)
                     {
                         // we won't actually draw it now, because we don't
-                        //  know the width of each glyph to that position. 
+                        //  know the width of each glyph to that position.
                         //  we need to go along with the iteration, and
                         //  make a mark where the box started:
                         drawing_box = true; // will turn false when finally rendered.
@@ -1190 +1141 @@
 
                         CRect rect;
                         // Set 'rect' depending on if it's a multiline control, or a one-line control
-                        if (multiline)
+                        if (m_Multiline)
                         {
-                            rect = CRect(m_CachedActualSize.left+box_x+buffer_zone, 
+                            rect = CRect(m_CachedActualSize.left+box_x+m_BufferZone,
                                        m_CachedActualSize.top+buffered_y+(h-ls)/2,
-                                       m_CachedActualSize.left+x_pointer+buffer_zone, 
+                                       m_CachedActualSize.left+x_pointer+m_BufferZone,
                                        m_CachedActualSize.top+buffered_y+(h+ls)/2);
 
                             if (rect.bottom < m_CachedActualSize.top)
@@ -1208 +1159 @@
                         }
                         else // if one-line
                         {
-                            rect = CRect(m_CachedActualSize.left+box_x+buffer_zone-m_HorizontalScroll, 
+                            rect = CRect(m_CachedActualSize.left+box_x+m_BufferZone-m_HorizontalScroll,
                                        m_CachedActualSize.top+buffered_y+(h-ls)/2,
-                                       m_CachedActualSize.left+x_pointer+buffer_zone-m_HorizontalScroll, 
+                                       m_CachedActualSize.left+x_pointer+m_BufferZone-m_HorizontalScroll,
                                        m_CachedActualSize.top+buffered_y+(h+ls)/2);
 
                             if (rect.left < m_CachedActualSize.left)
@@ -1225 +1176 @@
                         glEnable(GL_BLEND);
                         glDisable(GL_TEXTURE_2D);
 
-                        if (sprite_selectarea)
-                            GetGUI()->DrawSprite(*sprite_selectarea, cell_id, bz+0.05f, rect);
+                        if (!m_SpriteSelectArea.IsEmpty())
+                            GetGUI()->DrawSprite(m_SpriteSelectArea, m_CellId, bz+0.05f, rect);
 
                         // Blend can have been reset
                         glEnable(GL_BLEND);
@@ -1237 +1188 @@
                     }
 
                     if (i < (int)it->m_ListOfX.size())
-                        x_pointer += (float)font.GetCharacterWidth((*pCaption)[it->m_ListStart + i]);
+                        x_pointer += (float)font.GetCharacterWidth(m_Caption[it->m_ListStart + i]);
                 }
 
                 if (done)
@@ -1255 +1206 @@
 
         // Reset some from previous run
         buffered_y = -scroll;
-        
+
         // Setup initial color (then it might change and change back, when drawing selected area)
-        glColor4f(color.r, color.g, color.b, color.a);
+        glColor4f(m_TextColor.r, m_TextColor.g, m_TextColor.b, m_TextColor.a);
 
         bool using_selected_color = false;
-        
+
         for (std::list<SRow>::const_iterator it = m_CharacterPositions.begin();
              it != m_CharacterPositions.end();
              ++it, buffered_y += ls)
         {
-            if (buffered_y + buffer_zone >= -ls || !multiline)
+            if (buffered_y + m_BufferZone >= -ls || !m_Multiline)
             {
-                if (multiline)
+                if (m_Multiline)
                 {
-                    if (buffered_y + buffer_zone > m_CachedActualSize.GetHeight())
+                    if (buffered_y + m_BufferZone > m_CachedActualSize.GetHeight())
                         break;
                 }
 
                 glPushMatrix();
-                
+
                 // Text must always be drawn in integer values. So we have to convert scroll
-                if (multiline)
+                if (m_Multiline)
                     glTranslatef(0.f, -(float)(int)scroll, 0.f);
                 else
                     glTranslatef(-(float)(int)m_HorizontalScroll, 0.f, 0.f);
@@ -1285 +1236 @@
                 // (often compared against ints, so don't make it size_t)
                 for (int i=0; i < (int)it->m_ListOfX.size()+1; ++i)
                 {
-                    if (!multiline && i < (int)it->m_ListOfX.size())
+                    if (!m_Multiline && i < (int)it->m_ListOfX.size())
                     {
-                        if (it->m_ListOfX[i] - m_HorizontalScroll < -buffer_zone)
+                        if (it->m_ListOfX[i] - m_HorizontalScroll < -m_BufferZone)
                         {
                             // We still need to translate the OpenGL matrix
                             if (i == 0)
@@ -1300 +1251 @@
                     }
 
                     // End of selected area, change back color
-                    if (SelectingText() && 
+                    if (SelectingText() &&
                         it->m_ListStart + i == VirtualTo)
                     {
                         using_selected_color = false;
-                        glColor4f(color.r, color.g, color.b, color.a);
+                        glColor4f(m_TextColor.r, m_TextColor.g, m_TextColor.b, m_TextColor.a);
                     }
 
                     if (i != (int)it->m_ListOfX.size() &&
@@ -1317 +1268 @@
                     }
 
                     // Drawing selected area
-                    if (SelectingText() && 
+                    if (SelectingText() &&
                         it->m_ListStart + i >= VirtualFrom &&
                         it->m_ListStart + i < VirtualTo &&
                         using_selected_color == false)
                     {
                         using_selected_color = true;
-                        glColor4f(color_selected.r, color_selected.g, color_selected.b, color_selected.a);
+                        glColor4f(m_TextColorSelected.r, m_TextColorSelected.g, m_TextColorSelected.b, m_TextColorSelected.a);
                     }
 
                     if (i != (int)it->m_ListOfX.size())
-                        glwprintf(L"%lc", (*pCaption)[it->m_ListStart + i]);
+                        glwprintf(L"%lc", m_Caption[it->m_ListStart + i]);
 
                     // check it's now outside a one-liner, then we'll break
-                    if (!multiline && i < (int)it->m_ListOfX.size())                
+                    if (!m_Multiline && i < (int)it->m_ListOfX.size())
                     {
-                        if (it->m_ListOfX[i] - m_HorizontalScroll > m_CachedActualSize.GetWidth()-buffer_zone)
+                        if (it->m_ListOfX[i] - m_HorizontalScroll > m_CachedActualSize.GetWidth()-m_BufferZone)
                             break;
                     }
                 }
 
                 if (it->m_ListStart + (int)it->m_ListOfX.size() == m_iBufferPos)
                 {
-                    glColor4f(color.r, color.g, color.b, color.a);
+                    glColor4f(m_TextColor.r, m_TextColor.g, m_TextColor.b, m_TextColor.a);
                     glwprintf(L"_");
 
                     if (using_selected_color)
                     {
-                        glColor4f(color_selected.r, color_selected.g, color_selected.b, color_selected.a);
+                        glColor4f(m_TextColorSelected.r, m_TextColorSelected.g, m_TextColorSelected.b, m_TextColorSelected.a);
                     }
                 }
 
                 glPopMatrix();
             }
-            glTranslatef(0.f, ls, 0.f); 
+            glTranslatef(0.f, ls, 0.f);
         }
 
         glPopMatrix();
@@ -1364 +1315 @@
 
 void CInput::UpdateText(int from, int to_before, int to_after)
 {
-    CStrW caption;
-    CStrW font_name;
-    float buffer_zone;
-    bool multiline;
-    GUI<CStrW>::GetSetting(this, "font", font_name);
-    GUI<CStrW>::GetSetting(this, "caption", caption);
-    GUI<float>::GetSetting(this, "buffer_zone", buffer_zone);
-    GUI<bool>::GetSetting(this, "multiline", multiline);
-
     // Ensure positions are valid after caption changes
-    m_iBufferPos = std::min(m_iBufferPos, (int)caption.size());
-    m_iBufferPos_Tail = std::min(m_iBufferPos_Tail, (int)caption.size());
+    m_iBufferPos = std::min(m_iBufferPos, (int)m_Caption.size());
+    m_iBufferPos_Tail = std::min(m_iBufferPos_Tail, (int)m_Caption.size());
 
-    if (font_name == CStrW())
+    if (m_Font == L"") // XXX can this be possible? I set to default
     {
         // Destroy everything stored, there's no font, so there can be
         //  no data.
@@ -1387 +1329 @@
 
     SRow row;
     row.m_ListStart = 0;
-    
+
     int to = 0; // make sure it's initialized
 
     if (to_before == -1)
-        to = (int)caption.length();
+        to = (int)m_Caption.length();
 
-    CFont font(font_name);
+    CFont font(m_Font);
 
     std::list<SRow>::iterator current_line;
 
@@ -1412 +1354 @@
         ENSURE(to_before != -1);
 
         std::list<SRow>::iterator destroy_row_from, destroy_row_to;
-        // Used to check if the above has been set to anything, 
+        // Used to check if the above has been set to anything,
         //  previously a comparison like:
         //  destroy_row_from == std::list<SRow>::iterator()
         // ... was used, but it didn't work with GCC.
@@ -1423 +1365 @@
         //  to be redone. And when going along, we'll delete a row at a time
         //  when continuing to see how much more after 'to' we need to remake.
         int i=0;
-        for (std::list<SRow>::iterator it=m_CharacterPositions.begin(); 
+        for (std::list<SRow>::iterator it=m_CharacterPositions.begin();
              it!=m_CharacterPositions.end(); ++it, ++i)
         {
             if (destroy_row_from_used == false &&
@@ -1437 +1379 @@
 
                 // For the rare case that we might remove characters to a word
                 //  so that it suddenly fits on the previous row,
-                //  we need to by standards re-do the whole previous line too 
+                //  we need to by standards re-do the whole previous line too
                 //  (if one exists)
                 if (destroy_row_from != m_CharacterPositions.begin())
                     --destroy_row_from;
@@ -1451 +1393 @@
                 destroy_row_to_used = true;
 
                 // If it isn't the last row, we'll add another row to delete,
-                //  just so we can see if the last restorted line is 
+                //  just so we can see if the last restorted line is
                 //  identical to what it was before. If it isn't, then we'll
                 //  have to continue.
                 // 'check_point_row_start' is where we store how the that
@@ -1494 +1436 @@
         // set 'from' to the row we'll destroy from
         //  and 'to' to the row we'll destroy to
         from = destroy_row_from->m_ListStart;
-        
+
         if (destroy_row_to != m_CharacterPositions.end())
             to = destroy_row_to->m_ListStart; // notice it will iterate [from, to), so it will never reach to.
         else
-            to = (int)caption.length();
+            to = (int)m_Caption.length();
 
 
         // Setup the first row
@@ -1513 +1455 @@
         --temp_it;
 
         m_CharacterPositions.erase(destroy_row_from, destroy_row_to);
-        
+
         // If there has been a change in number of characters
         //  we need to change all m_ListStart that comes after
         //  the interval we just destroyed. We'll change all
@@ -1532 +1474 @@
             check_point_row_start += delta;
             check_point_row_end += delta;
 
-            if (to != (int)caption.length())
+            if (to != (int)m_Caption.length())
                 to += delta;
         }
     }
-    
+
     int last_word_started=from;
     //int last_list_start=-1;   // unused
     float x_pos = 0.f;
@@ -1546 +1488 @@
 
     for (int i=from; i<to; ++i)
     {
-        if (caption[i] == L'\n' && multiline)
+        if (m_Caption[i] == L'\n' && m_Multiline)
         {
-            if (i==to-1 && to != (int)caption.length())
+            if (i==to-1 && to != (int)m_Caption.length())
                 break; // it will be added outside
-            
+
             current_line = m_CharacterPositions.insert( current_line, row );
             ++current_line;
 
@@ -1563 +1505 @@
         }
         else
         {
-            if (caption[i] == L' '/* || TODO Gee (2004-10-13): the '-' disappears, fix.
+            if (m_Caption[i] == L' '/* || TODO Gee (2004-10-13): the '-' disappears, fix.
                 caption[i] == L'-'*/)
                 last_word_started = i+1;
 
-            x_pos += (float)font.GetCharacterWidth(caption[i]);
+            x_pos += (float)font.GetCharacterWidth(m_Caption[i]);
 
-            if (x_pos >= GetTextAreaWidth() && multiline)
+            if (x_pos >= GetTextAreaWidth() && m_Multiline)
             {
                 // The following decides whether it will word-wrap a word,
                 //  or if it's only one word on the line, where it has to
@@ -1586 +1528 @@
                     // regular word-wrap
                     row.m_ListOfX.resize(row.m_ListOfX.size() - (i-last_word_started+1));
                 }
-                
+
                 // Now, create a new line:
                 //  notice: when we enter a newline, you can stand with the cursor
                 //  both before and after that character, being on different
@@ -1614 +1556 @@
         //  also check if the current line isn't the end
         if (to_before != -1 && i == to-1 && current_line != m_CharacterPositions.end())
         {
-            // check all rows and see if any existing 
+            // check all rows and see if any existing
             if (row.m_ListStart != check_point_row_start)
             {
                 std::list<SRow>::iterator destroy_row_from, destroy_row_to;
-                // Are used to check if the above has been set to anything, 
+                // Are used to check if the above has been set to anything,
                 //  previously a comparison like:
                 //  destroy_row_from == std::list<SRow>::iterator()
                 //  was used, but it didn't work with GCC.
@@ -1629 +1571 @@
                 //  to be redone. And when going along, we'll delete a row at a time
                 //  when continuing to see how much more after 'to' we need to remake.
                 int i=0;
-                for (std::list<SRow>::iterator it=m_CharacterPositions.begin(); 
+                for (std::list<SRow>::iterator it=m_CharacterPositions.begin();
                     it!=m_CharacterPositions.end(); ++it, ++i)
                 {
                     if (destroy_row_from_used == false &&
@@ -1652 +1594 @@
                         destroy_row_to_used = true;
 
                         // If it isn't the last row, we'll add another row to delete,
-                        //  just so we can see if the last restorted line is 
+                        //  just so we can see if the last restorted line is
                         //  identical to what it was before. If it isn't, then we'll
                         //  have to continue.
                         // 'check_point_row_start' is where we store how the that
                         //  line looked.
-            //          if (destroy_row_to != 
+            //          if (destroy_row_to !=
                         if (destroy_row_to != m_CharacterPositions.end())
                         {
                             check_point_row_start = destroy_row_to->m_ListStart;
@@ -1694 +1636 @@
                 // set 'from' to the from row we'll destroy
                 //  and 'to' to 'to_after'
                 from = destroy_row_from->m_ListStart;
-                
+
                 if (destroy_row_to != m_CharacterPositions.end())
                     to = destroy_row_to->m_ListStart; // notice it will iterate [from, to[, so it will never reach to.
                 else
-                    to = (int)caption.length();
+                    to = (int)m_Caption.length();
 
 
                 // Set current line, new rows will be added before current_line, so
@@ -1728 +1670 @@
     // add the final row (even if empty)
     m_CharacterPositions.insert(current_line, row);
 
-    bool scrollbar;
-    GUI<bool>::GetSetting(this, "scrollbar", scrollbar);
     // Update scollbar
-    if (scrollbar)
+    if (m_Scrollbar)
     {
-        GetScrollBar(0).SetScrollRange(m_CharacterPositions.size() * font.GetLineSpacing() + buffer_zone*2.f);
+        GetScrollBar(0).SetScrollRange(m_CharacterPositions.size() * font.GetLineSpacing() + m_BufferZone*2.f);
         GetScrollBar(0).SetScrollSpace(m_CachedActualSize.GetHeight());
     }
 }
@@ -1746 +1686 @@
     // Return position
     int retPosition;
 
-    float buffer_zone;
-    bool multiline;
-    GUI<float>::GetSetting(this, "buffer_zone", buffer_zone);
-    GUI<bool>::GetSetting(this, "multiline", multiline);
-
     std::list<SRow>::iterator current = m_CharacterPositions.begin();
 
     CPos mouse = GetMousePos();
 
-    if (multiline)
+    if (m_Multiline)
     {
-        CStrW font_name;
-        bool scrollbar;
-        GUI<CStrW>::GetSetting(this, "font", font_name);
-        GUI<bool>::GetSetting(this, "scrollbar", scrollbar);
-        
         float scroll=0.f;
-        if (scrollbar)
+        if (m_Scrollbar)
         {
             scroll = GetScrollBar(0).GetPos();
         }
 
-        // Pointer to caption, will come in handy
-        CStrW *pCaption = (CStrW*)m_Settings["caption"].m_pSetting;
-        UNUSED2(pCaption);
-
         // Now get the height of the font.
                         // TODO: Get the real font
-        CFont font(font_name);
+        CFont font(m_Font);
         float spacing = (float)font.GetLineSpacing();
         //float height = (float)font.GetHeight();   // unused
 
         // Change mouse position relative to text.
         mouse -= m_CachedActualSize.TopLeft();
-        mouse.x -= buffer_zone;
-        mouse.y += scroll - buffer_zone;
+        mouse.x -= m_BufferZone;
+        mouse.y += scroll - m_BufferZone;
 
         //if ((m_CharacterPositions.size()-1) * spacing + height < mouse.y)
-        //  m_iBufferPos = pCaption->Length();
+        //  m_iBufferPos = m_Caption.Length();
         int row = (int)((mouse.y) / spacing);//m_CharachterPositions.size()
 
         if (row < 0)
@@ -1804 +1730 @@
         // current is already set to begin,
         //  but we'll change the mouse.x to fit our horizontal scrolling
         mouse -= m_CachedActualSize.TopLeft();
-        mouse.x -= buffer_zone - m_HorizontalScroll;
+        mouse.x -= m_BufferZone - m_HorizontalScroll;
         // mouse.y is moot
     }
 
     //m_iBufferPos = m_CharacterPositions.get.m_ListStart;
     retPosition = current->m_ListStart;
-    
+
     // Okay, now loop through the glyphs to find the appropriate X position
     float dummy;
     retPosition += GetXTextPosition(current, mouse.x, dummy);
@@ -1854 +1780 @@
 
 void CInput::DeleteCurSelection()
 {
-    CStrW *pCaption = (CStrW*)m_Settings["caption"].m_pSetting;
-
     int virtualFrom;
     int virtualTo;
 
@@ -1870 +1794 @@
         virtualTo = m_iBufferPos;
     }
 
-    *pCaption = pCaption->Left( virtualFrom ) + 
-                pCaption->Right( (long) pCaption->length() - (virtualTo) );
+    m_Caption = m_Caption.Left( virtualFrom ) +
+                m_Caption.Right( (long) m_Caption.length() - (virtualTo) );
 
     UpdateText(virtualFrom, virtualTo, virtualFrom);
 
@@ -1888 +1812 @@
 
 float CInput::GetTextAreaWidth()
 {
-    bool scrollbar;
-    float buffer_zone;
-    GUI<bool>::GetSetting(this, "scrollbar", scrollbar);
-    GUI<float>::GetSetting(this, "buffer_zone", buffer_zone);
-
-    if (scrollbar && GetScrollBar(0).GetStyle())
-        return m_CachedActualSize.GetWidth() - buffer_zone*2.f - GetScrollBar(0).GetStyle()->m_Width;
+    if (m_Scrollbar && GetScrollBar(0).GetStyle())
+        return m_CachedActualSize.GetWidth() - m_BufferZone*2.f - GetScrollBar(0).GetStyle()->m_Width;
     else
-        return m_CachedActualSize.GetWidth() - buffer_zone*2.f;
+        return m_CachedActualSize.GetWidth() - m_BufferZone*2.f;
 }
 
 void CInput::UpdateAutoScroll()
 {
-    float buffer_zone;
-    bool multiline;
-    GUI<float>::GetSetting(this, "buffer_zone", buffer_zone);
-    GUI<bool>::GetSetting(this, "multiline", multiline);
-
     // Autoscrolling up and down
-    if (multiline)
+    if (m_Multiline)
     {
-        CStrW font_name;
-        bool scrollbar;
-        GUI<CStrW>::GetSetting(this, "font", font_name);
-        GUI<bool>::GetSetting(this, "scrollbar", scrollbar);
-        
         float scroll=0.f;
-        if (!scrollbar)
+        if (!m_Scrollbar)
             return;
 
         scroll = GetScrollBar(0).GetPos();
-        
+
         // Now get the height of the font.
                         // TODO: Get the real font
-        CFont font(font_name);
+        CFont font(m_Font);
         float spacing = (float)font.GetLineSpacing();
         //float height = font.GetHeight();
 
@@ -1936 +1845 @@
             if (m_iBufferPos >= current->m_ListStart &&
                 m_iBufferPos <= current->m_ListStart+(int)current->m_ListOfX.size())
                 break;
-            
+
             ++current;
             ++row;
         }
 
         // If scrolling down
-        if (-scroll + (float)(row+1) * spacing + buffer_zone*2.f > m_CachedActualSize.GetHeight())
+        if (-scroll + (float)(row+1) * spacing + m_BufferZone*2.f > m_CachedActualSize.GetHeight())
         {
             // Scroll so the selected row is shown completely, also with buffer_zone length to the edge.
-            GetScrollBar(0).SetPos((float)(row+1) * spacing - m_CachedActualSize.GetHeight() + buffer_zone*2.f);
+            GetScrollBar(0).SetPos((float)(row+1) * spacing - m_CachedActualSize.GetHeight() + m_BufferZone*2.f);
         }
         else
         // If scrolling up
@@ -1976 +1885 @@
         }
 
         // Check if outside to the right
-        if (x_position - m_HorizontalScroll + buffer_zone*2.f > m_CachedActualSize.GetWidth())
-            m_HorizontalScroll = x_position - m_CachedActualSize.GetWidth() + buffer_zone*2.f;
+        if (x_position - m_HorizontalScroll + m_BufferZone*2.f > m_CachedActualSize.GetWidth())
+            m_HorizontalScroll = x_position - m_CachedActualSize.GetWidth() + m_BufferZone*2.f;
 
         // Check if outside to the left
         if (x_position - m_HorizontalScroll < 0.f)
@@ -1985 +1894 @@
 
         // Check if the text doesn't even fill up to the right edge even though scrolling is done.
         if (m_HorizontalScroll != 0.f &&
-            x_total - m_HorizontalScroll + buffer_zone*2.f < m_CachedActualSize.GetWidth())
-            m_HorizontalScroll = x_total - m_CachedActualSize.GetWidth() + buffer_zone*2.f;
+            x_total - m_HorizontalScroll + m_BufferZone*2.f < m_CachedActualSize.GetWidth())
+            m_HorizontalScroll = x_total - m_CachedActualSize.GetWidth() + m_BufferZone*2.f;
 
         // Now this is the fail-safe, if x_total isn't even the length of the control,
         //  remove all scrolling
-        if (x_total + buffer_zone*2.f < m_CachedActualSize.GetWidth())
+        if (x_total + m_BufferZone*2.f < m_CachedActualSize.GetWidth())
             m_HorizontalScroll = 0.f;
     }
 }

source/gui/CDropDown.h

@@ -99 +99 @@
      * made that can change the visual.
      */
     void SetupText();
-    
+
     // Sets up the cached GetListRect. Decided whether it should
     //  have a scrollbar, and so on.
     virtual void SetupListRect();
@@ -127 +127 @@
     //  it is set to "selected", but then when moving the mouse it will
     //  change.
     int m_ElementHighlight;
+private:
+    float               m_ButtonWidth;
+    float               m_DropdownSize;
+    float               m_DropdownBuffer;
+    CGUISpriteInstance  m_SpriteList;
+    CGUISpriteInstance  m_Sprite2;
+    CGUISpriteInstance  m_SpriteOver2;
+    CGUISpriteInstance  m_SpritePressed2;
+    CGUISpriteInstance  m_SpriteDisabled2;
+
 };
 
 #endif

source/gui/IGUIButtonBehavior.cpp

@@ -28 +28 @@
 //-------------------------------------------------------------------
 IGUIButtonBehavior::IGUIButtonBehavior() : m_Pressed(false)
 {
+    AddSetting(GUIST_CColor,    "textcolor",            &m_ButtonTextColor);
+    AddSetting(GUIST_CColor,    "textcolor_over",       &m_ButtonTextColorOver);
+    AddSetting(GUIST_CColor,    "textcolor_pressed",    &m_ButtonTextColorPressed);
+    AddSetting(GUIST_CColor,    "textcolor_disabled",   &m_ButtonTextColorDisabled);
 }
 
 IGUIButtonBehavior::~IGUIButtonBehavior()
@@ -41 +45 @@
     {
     case GUIM_MOUSE_PRESS_LEFT:
     {
-        bool enabled;
-        GUI<bool>::GetSetting(this, "enabled", enabled);
-    
-        if (!enabled)
-            break;
+        if ( IsEnabled() )
+        {
+            m_Pressed = true;
+        }
 
-        m_Pressed = true;
-    }   break;
+        break;
+    }
 
     case GUIM_MOUSE_DBLCLICK_LEFT:
     case GUIM_MOUSE_RELEASE_LEFT:
     {
-        bool enabled;
-        GUI<bool>::GetSetting(this, "enabled", enabled);
-    
-        if (!enabled)
-            break;
-
-        if (m_Pressed)
+        if ( IsEnabled() && m_Pressed )
         {
             m_Pressed = false;
             if (Message.type == GUIM_MOUSE_RELEASE_LEFT)
@@ -77 +74 @@
                 SendEvent(GUIM_DOUBLE_PRESSED, "doublepress");
             }
         }
-    }   break;
+        break;
+    }
 
     default:
         break;
@@ -86 +84 @@
 
 CColor IGUIButtonBehavior::ChooseColor()
 {
-    CColor color, color2;
-
-    // Yes, the object must possess these settings. They are standard
-    GUI<CColor>::GetSetting(this, "textcolor", color);
-
-    bool enabled;
-    GUI<bool>::GetSetting(this, "enabled", enabled);
-
-    if (!enabled)
+    if (!IsEnabled())
     {
-        GUI<CColor>::GetSetting(this, "textcolor_disabled", color2);
-        return GUI<>::FallBackColor(color2, color);
+        return GUI<>::FallBackColor(m_ButtonTextColorDisabled, m_ButtonTextColor);
     }
-    else
-    if (m_MouseHovering)
+    else if (m_MouseHovering)
     {
         if (m_Pressed)
         {
-            GUI<CColor>::GetSetting(this, "textcolor_pressed", color2);
-            return GUI<>::FallBackColor(color2, color);
+            return GUI<>::FallBackColor(m_ButtonTextColorPressed, m_ButtonTextColor);
         }
         else
         {
-            GUI<CColor>::GetSetting(this, "textcolor_over", color2);
-            return GUI<>::FallBackColor(color2, color);
+            return GUI<>::FallBackColor(m_ButtonTextColorOver, m_ButtonTextColor);
         }
     }
-    else return color;
+
+    return m_ButtonTextColor;
 }
 
 void IGUIButtonBehavior::DrawButton(const CRect &rect,
@@ -126 +113 @@
 {
     if (GetGUI())
     {
-        bool enabled;
-        GUI<bool>::GetSetting(this, "enabled", enabled);
-
-        if (!enabled)
+        if (!IsEnabled())
         {
             GetGUI()->DrawSprite(GUI<>::FallBackSprite(sprite_disabled, sprite), cell_id, z, rect);
         }

source/gui/CButton.cpp

@@ -31 +31 @@
 //-------------------------------------------------------------------
 CButton::CButton()
 {
-    AddSetting(GUIST_float,                 "buffer_zone");
-    AddSetting(GUIST_CGUIString,            "caption");
-    AddSetting(GUIST_int,                   "cell_id");
-    AddSetting(GUIST_CStrW,                 "font");
-    AddSetting(GUIST_CGUISpriteInstance,    "sprite");
-    AddSetting(GUIST_CGUISpriteInstance,    "sprite_over");
-    AddSetting(GUIST_CGUISpriteInstance,    "sprite_pressed");
-    AddSetting(GUIST_CGUISpriteInstance,    "sprite_disabled");
-    AddSetting(GUIST_EAlign,                "text_align");
-    AddSetting(GUIST_EVAlign,               "text_valign");
-    AddSetting(GUIST_CColor,                "textcolor");
-    AddSetting(GUIST_CColor,                "textcolor_over");
-    AddSetting(GUIST_CColor,                "textcolor_pressed");
-    AddSetting(GUIST_CColor,                "textcolor_disabled");
-    AddSetting(GUIST_CStrW,                 "tooltip");
-    AddSetting(GUIST_CStr,                  "tooltip_style");
+    AddSetting(GUIST_float,                 "buffer_zone",       &m_BufferZone);
+    AddSetting(GUIST_CGUIString,            "caption",           &m_Caption);
+    AddSetting(GUIST_int,                   "cell_id",           &m_CellId);
+    AddSetting(GUIST_CStrW,                 "font",              &m_Font);
+    AddSetting(GUIST_CGUISpriteInstance,    "sprite",            &m_Sprite);
+    AddSetting(GUIST_CGUISpriteInstance,    "sprite_over",       &m_SpriteOver);
+    AddSetting(GUIST_CGUISpriteInstance,    "sprite_pressed",    &m_SpritePressed);
+    AddSetting(GUIST_CGUISpriteInstance,    "sprite_disabled",   &m_SpriteDisabled);
 
+    AddSetting(GUIST_CStrW,                 "tooltip",           &m_Tooltip);
+    AddSetting(GUIST_CStr,                  "tooltip_style",     &m_TooltipStyle);
+
+    m_BufferZone = 0.f;
+    m_Font = L"default";
+
     // Add text
     AddText(new SGUIText());
 }
@@ -63 +61 @@
 
     ENSURE(m_GeneratedTexts.size()==1);
 
-    CStrW font;
-    if (GUI<CStrW>::GetSetting(this, "font", font) != PSRETURN_OK || font.empty())
-        // Use the default if none is specified
-        // TODO Gee: (2004-08-14) Default should not be hard-coded, but be in styles!
-        font = L"default";
+    *m_GeneratedTexts[0] = GetGUI()->GenerateText(m_Caption, m_Font, m_CachedActualSize.GetWidth(), m_BufferZone, this);
 
-    CGUIString caption;
-    GUI<CGUIString>::GetSetting(this, "caption", caption);
-
-    float buffer_zone=0.f;
-    GUI<float>::GetSetting(this, "buffer_zone", buffer_zone);
-    *m_GeneratedTexts[0] = GetGUI()->GenerateText(caption, font, m_CachedActualSize.GetWidth(), buffer_zone, this);
-
     CalculateTextPosition(m_CachedActualSize, m_TextPos, *m_GeneratedTexts[0]);
 }
 
@@ -86 +73 @@
     IGUITextOwner::HandleMessage(Message);
 }
 
-void CButton::Draw() 
+void CButton::Draw()
 {
     float bz = GetBufferedZ();
 
-    CGUISpriteInstance *sprite, *sprite_over, *sprite_pressed, *sprite_disabled;
-    int cell_id;
-
-    // Statically initialise some strings, so we don't have to do
-    // lots of allocation every time this function is called
-    static CStr strSprite("sprite");
-    static CStr strSpriteOver("sprite_over");
-    static CStr strSpritePressed("sprite_pressed");
-    static CStr strSpriteDisabled("sprite_disabled");
-    static CStr strCellId("cell_id");
-
-    GUI<CGUISpriteInstance>::GetSettingPointer(this, strSprite, sprite);
-    GUI<CGUISpriteInstance>::GetSettingPointer(this, strSpriteOver, sprite_over);
-    GUI<CGUISpriteInstance>::GetSettingPointer(this, strSpritePressed, sprite_pressed);
-    GUI<CGUISpriteInstance>::GetSettingPointer(this, strSpriteDisabled, sprite_disabled);
-    GUI<int>::GetSetting(this, strCellId, cell_id);
-
     DrawButton(m_CachedActualSize,
                bz,
-               *sprite,
-               *sprite_over,
-               *sprite_pressed,
-               *sprite_disabled,
-               cell_id);
+               m_Sprite,
+               m_SpriteOver,
+               m_SpritePressed,
+               m_SpriteDisabled,
+               m_CellId);
 
-    CColor color = ChooseColor();
-    IGUITextOwner::Draw(0, color, m_TextPos, bz+0.1f);
+    IGUITextOwner::Draw(0, ChooseColor(), m_TextPos, bz+0.1f);
 }

source/gui/IGUITextOwner.h

@@ -88 +88 @@
      * @param clipping Clipping rectangle, don't even add a parameter
      *        to get no clipping.
      */
-    virtual void Draw(const int &index, const CColor &color, const CPos &pos, 
+    virtual void Draw(const int &index, const CColor &color, const CPos &pos,
                       const float &z, const CRect &clipping = CRect());
 
     /**
@@ -117 +117 @@
      * Calculate the position for the text, based on the alignment.
      */
     void CalculateTextPosition(CRect &ObjSize, CPos &TextPos, SGUIText &Text);
+private:
+    EAlign              m_TextAlign;
+    EVAlign             m_TextVAlign;
+
 };
 
 #endif

source/gui/CList.h

@@ -121 +121 @@
 
     // Extended drawing interface, this is so that classes built on the this one
     //  can use other sprite names.
-    void DrawList(const int &selected, const CStr& _sprite, 
-                  const CStr& _sprite_selected, const CStr& _textcolor);
+    void DrawList(const int &selected, const CGUISpriteInstance& _sprite);
 
     // Get the area of the list. This is so that i can easily be changed, like in CDropDown
     //  where the area is not equal to m_CachedActualSize.
@@ -138 +137 @@
      * be zero, but still stored for easy handling.
      */
     std::vector<float> m_ItemsYPositions;
+
+    void SetSelected(const int index, const bool SkipMessage = false);
+
+public:
+    bool IsScrollbar() const { return m_Scrollbar; }
+    void SetScrollbar(const bool scrollbar, const bool SkipMessage = false);
+    const CGUIList& GetList() const { return m_List; }
+
+    int GetSelectedIndex() const { return m_Selected; }
+
+    int GetCellId() const { return m_CellId; }
+
+    const CColor& GetTextColor() const { return m_TextColor; }
+
+    const CGUISpriteInstance& GetSprite() const { return m_Sprite; }
+
+private:
+    float               m_BufferZone;
+//  CGUIString          m_Caption; // disabled for some unknown reason
+    int                 m_CellId;
+    CStrW               m_Font;
+    bool                m_Scrollbar;
+    CStr                m_ScrollbarStyle;
+    CGUISpriteInstance  m_Sprite;
+    CGUISpriteInstance  m_SpriteSelectArea;
+    EAlign              m_TextAlign;
+    CColor              m_TextColor;
+    CColor              m_TextSelected;
+    int                 m_Selected;
+    CStrW               m_Tooltip;
+    CStr                m_TooltipStyle;
+
+    CGUIList            m_List;
+    CGUIList            m_ListData;
+
 };
 
 #endif

source/gui/GUIutil.h

@@ -343 +343 @@
     {
         // Statically initialise some strings, so we don't have to do
         // lots of allocation every time this function is called
-        static CStr strHidden("hidden");
-        static CStr strEnabled("enabled");
-        static CStr strGhost("ghost");
+//      static CStr strHidden("hidden");
+//      static CStr strEnabled("enabled");
+//      static CStr strGhost("ghost");
 
         if (RR & GUIRR_HIDDEN)
         {
-            bool hidden = true;
-            GUI<bool>::GetSetting(pObject, strHidden, hidden);
+//          bool hidden = true;
+//          GUI<bool>::GetSetting(pObject, strHidden, hidden);
 
-            if (hidden)
+            if ( pObject->IsHidden() )
                 return true;
         }
         if (RR & GUIRR_DISABLED)
         {
-            bool enabled = false;
-            GUI<bool>::GetSetting(pObject, strEnabled, enabled);
+//          bool enabled = false;
+//          GUI<bool>::GetSetting(pObject, strEnabled, enabled);
 
-            if (!enabled)
+            if (! pObject->IsEnabled() )
                 return true;
         }
         if (RR & GUIRR_GHOST)
         {
-            bool ghost = true;
-            GUI<bool>::GetSetting(pObject, strGhost, ghost);
+//          bool ghost = true;
+//          GUI<bool>::GetSetting(pObject, strGhost, ghost);
 
-            if (ghost)
+            if ( pObject->IsGhost() )
                 return true;
         }
 

source/gui/CGUI.cpp

@@ -1365 +1365 @@
     if (!ManuallySetZ)
     {
         // Set it automatically to 10 plus its parents
-        bool absolute;
-        GUI<bool>::GetSetting(object, "absolute", absolute);
+//      bool absolute;
+//      GUI<bool>::GetSetting(object, "absolute", absolute);
 
         // If the object is absolute, we'll have to get the parent's Z buffered,
         //  and add to that!
-        if (absolute)
+        if ( object->IsAbsolute() )
         {
-            GUI<float>::SetSetting(object, "z", pParent->GetBufferedZ() + 10.f, true);
+//          GUI<float>::SetSetting(object, "z", pParent->GetBufferedZ() + 10.f, true);
+            object->SetZ(pParent->GetBufferedZ() + 10.f, true);
         }
         else
         // If the object is relative, then we'll just store Z as "10"
         {
-            GUI<float>::SetSetting(object, "z", 10.f, true);
+//          GUI<float>::SetSetting(object, "z", 10.f, true);
+            object->SetZ(10.f, true);
         }
     }
 

source/gui/CText.cpp

@@ -32 +32 @@
 //-------------------------------------------------------------------
 CText::CText()
 {
-    AddSetting(GUIST_float,                 "buffer_zone");
-    AddSetting(GUIST_CGUIString,            "caption");
-    AddSetting(GUIST_int,                   "cell_id");
-    AddSetting(GUIST_bool,                  "clip");
-    AddSetting(GUIST_CStrW,                 "font");
-    AddSetting(GUIST_bool,                  "scrollbar");
-    AddSetting(GUIST_CStr,                  "scrollbar_style");
-    AddSetting(GUIST_bool,                  "scroll_bottom");
-    AddSetting(GUIST_CGUISpriteInstance,    "sprite");
-    AddSetting(GUIST_EAlign,                "text_align");
-    AddSetting(GUIST_EVAlign,               "text_valign");
-    AddSetting(GUIST_CColor,                "textcolor");
-    AddSetting(GUIST_CStrW,                 "tooltip");
-    AddSetting(GUIST_CStr,                  "tooltip_style");
+    AddSetting(GUIST_float,                 "buffer_zone",      &m_BufferZone);
+    AddSetting(GUIST_CGUIString,            "caption",          &m_Caption);
+    AddSetting(GUIST_int,                   "cell_id",          &m_CellId);
+    AddSetting(GUIST_bool,                  "clip",             &m_Clip);
+    AddSetting(GUIST_CStrW,                 "font",             &m_Font);
+    AddSetting(GUIST_bool,                  "scrollbar",        &m_Scrollbar);
+    AddSetting(GUIST_CStr,                  "scrollbar_style",  &m_ScrollbarStyle);
+    AddSetting(GUIST_bool,                  "scroll_bottom",    &m_ScrollBottom);
+    AddSetting(GUIST_CGUISpriteInstance,    "sprite",           &m_Sprite);
+    AddSetting(GUIST_CColor,                "textcolor",        &m_TextColor);
+    AddSetting(GUIST_CStrW,                 "tooltip",          &m_Tooltip);
+    AddSetting(GUIST_CStr,                  "tooltip_style",    &m_TooltipStyle);
 
     // Private settings
-    AddSetting(GUIST_CStrW,                 "_icon_tooltip");
-    AddSetting(GUIST_CStr,                  "_icon_tooltip_style");
+    AddSetting(GUIST_CStrW,                 "_icon_tooltip",       &m_IconTooltip);
+    AddSetting(GUIST_CStr,                  "_icon_tooltip_style", &m_IconTooltipStyle);
 
+    m_BufferZone = 0.f;
+    m_Font = L"default";
+    m_ScrollBottom = false;
+
     //GUI<bool>::SetSetting(this, "ghost", true);
     GUI<bool>::SetSetting(this, "scrollbar", false);
     GUI<bool>::SetSetting(this, "clip", true);
@@ -76 +78 @@
 
     ENSURE(m_GeneratedTexts.size()>=1);
 
-    CStrW font;
-    if (GUI<CStrW>::GetSetting(this, "font", font) != PSRETURN_OK || font.empty())
-        // Use the default if none is specified
-        // TODO Gee: (2004-08-14) Don't define standard like this. Do it with the default style.
-        font = L"default";
-
-    CGUIString caption;
-    bool scrollbar;
-    GUI<CGUIString>::GetSetting(this, "caption", caption);
-    GUI<bool>::GetSetting(this, "scrollbar", scrollbar);
-
     float width = m_CachedActualSize.GetWidth();
     // remove scrollbar if applicable
-    if (scrollbar && GetScrollBar(0).GetStyle())
+    if (m_Scrollbar && GetScrollBar(0).GetStyle())
         width -= GetScrollBar(0).GetStyle()->m_Width;
 
 
-    float buffer_zone=0.f;
-    GUI<float>::GetSetting(this, "buffer_zone", buffer_zone);
-    *m_GeneratedTexts[0] = GetGUI()->GenerateText(caption, font, width, buffer_zone, this);
+    *m_GeneratedTexts[0] = GetGUI()->GenerateText(m_Caption, m_Font, width, m_BufferZone, this);
 
-    if (! scrollbar)
+    if (! m_Scrollbar)
         CalculateTextPosition(m_CachedActualSize, m_TextPos, *m_GeneratedTexts[0]);
 
     // Setup scrollbar
-    if (scrollbar)
+    if (m_Scrollbar)
     {
-        bool scrollbottom = false;
-        GUI<bool>::GetSetting(this, "scroll_bottom", scrollbottom);
-
         // If we are currently scrolled to the bottom of the text,
         // then add more lines of text, update the scrollbar so we
         // stick to the bottom.
         // (Use 1.5px delta so this triggers the first time caption is set)
         bool bottom = false;
-        if (scrollbottom && GetScrollBar(0).GetPos() > GetScrollBar(0).GetMaxPos() - 1.5f)
+        if (m_ScrollBottom && GetScrollBar(0).GetPos() > GetScrollBar(0).GetMaxPos() - 1.5f)
             bottom = true;
 
         GetScrollBar(0).SetScrollRange(m_GeneratedTexts[0]->m_Size.cy);
@@ -143 +129 @@
         // Update scrollbar
         if (Message.value == "scrollbar_style")
         {
-            CStr scrollbar_style;
-            GUI<CStr>::GetSetting(this, Message.value, scrollbar_style);
+            GetScrollBar(0).SetScrollBarStyle( m_ScrollbarStyle );
 
-            GetScrollBar(0).SetScrollBarStyle( scrollbar_style );
-
             SetupText();
         }
 
@@ -178 +161 @@
         GetScrollBar(0).SetZ( GetBufferedZ() );
         GetScrollBar(0).SetLength( m_CachedActualSize.bottom - m_CachedActualSize.top );
 
-        CStr scrollbar_style;
-        GUI<CStr>::GetSetting(this, "scrollbar_style", scrollbar_style);
-        GetScrollBar(0).SetScrollBarStyle( scrollbar_style );
+        GetScrollBar(0).SetScrollBarStyle( m_ScrollbarStyle );
         }
         break;
 
@@ -191 +172 @@
     IGUITextOwner::HandleMessage(Message);
 }
 
-void CText::Draw() 
+void CText::Draw()
 {
-    float bz = GetBufferedZ();
-
     // First call draw on ScrollBarOwner
-    bool scrollbar;
-    GUI<bool>::GetSetting(this, "scrollbar", scrollbar);
-
-    if (scrollbar)
+    if (m_Scrollbar)
     {
         // Draw scrollbar
         IGUIScrollBarOwner::Draw();
@@ -207 +183 @@
 
     if (GetGUI())
     {
-        CGUISpriteInstance *sprite;
-        int cell_id;
-        bool clip;
-        GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite", sprite);
-        GUI<int>::GetSetting(this, "cell_id", cell_id);
-        GUI<bool>::GetSetting(this, "clip", clip);
+        float bz = GetBufferedZ();
 
-        GetGUI()->DrawSprite(*sprite, cell_id, bz, m_CachedActualSize);
+        GetGUI()->DrawSprite(m_Sprite, m_CellId, bz, m_CachedActualSize);
 
         float scroll=0.f;
-        if (scrollbar)
+        if (m_Scrollbar)
         {
             scroll = GetScrollBar(0).GetPos();
         }
 
         // Clipping area (we'll have to subtract the scrollbar)
         CRect cliparea;
-        if (clip)
+        if (m_Clip)
         {
             cliparea = m_CachedActualSize;
 
-            if (scrollbar)
+            if (m_Scrollbar)
             {
                 // subtract scrollbar from cliparea
                 if (cliparea.right > GetScrollBar(0).GetOuterRect().left &&
@@ -241 +212 @@
             }
         }
 
-        CColor color;
-        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);
+        if (m_Scrollbar)
+            IGUITextOwner::Draw(0, m_TextColor, m_CachedActualSize.TopLeft() - CPos(0.f, scroll), bz+0.1f, cliparea);
         else
-            IGUITextOwner::Draw(0, color, m_TextPos, bz+0.1f, cliparea);
+            IGUITextOwner::Draw(0, m_TextColor, m_TextPos, bz+0.1f, cliparea);
     }
 }
 

source/gui/IGUIObject.h

@@ -111 +111 @@
 
     void                *m_pSetting;
     EGUISettingType     m_Type;
+    bool                m_dynamic;
 };
 
 /**
@@ -198 +199 @@
     void AddToPointersMap(map_pObjects &ObjectMap);
 
     /**
-     * Notice nothing will be returned or thrown if the child hasn't 
-     * been inputted into the GUI yet. This is because that's were 
+     * Notice nothing will be returned or thrown if the child hasn't
+     * been inputted into the GUI yet. This is because that's were
      * all is checked. Now we're just linking two objects, but
      * it's when we're inputting them into the GUI we'll check
      * validity! Notice also when adding it to the GUI this function
@@ -239 +240 @@
      * @return True if settings exist.
      */
     bool SettingExists(const CStr& Setting) const;
-    
+
     /**
      * All sizes are relative to resolution, and the calculation
      * is not wanted in real time, therefore it is cached, update
@@ -291 +292 @@
      * @param pGUI GUI instance to associate the script with
      */
     void RegisterScriptHandler(const CStr& Action, const CStr& Code, CGUI* pGUI);
-    
+
     /**
      * Retrieves the JSObject representing this GUI object.
      */
@@ -317 +318 @@
      * @param Type Setting type
      * @param Name Setting reference name
      */
-    void AddSetting(const EGUISettingType &Type, const CStr& Name);
+    void AddSetting(const EGUISettingType &Type, const CStr& Name, void *Pointer = 0);
 
     /**
      * Calls Destroy on all children, and deallocates all memory.
      * MEGA TODO Should it destroy it's children?
      */
     virtual void Destroy();
-    
+
 public:
     /**
      * This function is called with different messages
@@ -387 +388 @@
      * Set parent of this object
      */
     void SetParent(IGUIObject *pParent) { m_pParent = pParent; }
-    
+
     /**
      * Reset internal state of this object
      */
@@ -435 +436 @@
      * Notice 'false' is default, because an object not using this function, should not
      * have any additional children (and this function should never be called).
      */
-    virtual bool HandleAdditionalChildren(const XMBElement& UNUSED(child), 
+    virtual bool HandleAdditionalChildren(const XMBElement& UNUSED(child),
                                           CXeromyces* UNUSED(pFile)) { return false; }
 
     /**
@@ -480 +481 @@
     /** @name Internal functions */
     //--------------------------------------------------------
     //@{
-    
+
     /**
      * Inputs a reference pointer, checks if the new inputted object
      * if hovered, if so, then check if this's Z value is greater
@@ -529 +530 @@
 
     // Pointer to parent
     IGUIObject                              *m_pParent;
-    
+
     //This represents the last click time for each mouse button
     double m_LastClickTime[6];
 
@@ -542 +543 @@
      * read. This is important to know because I don't want to force
      * the user to include its \<styles\>-XML-files first, so somehow
      * the GUI needs to know which settings were set, and which is meant
-     * to 
+     * to
      */
 
     // More variables
@@ -558 +559 @@
      *
      * @see SetupSettings()
      */
-    public:
+
+private:
+    bool                                    m_Enabled;
+    bool                                    m_Hidden;
+    bool                                    m_Absolute;
+    bool                                    m_Ghost;
+    float                                   m_Z;
+    CClientArea                             m_Size;
+    CStr                                    m_Style;
+    CStr                                    m_Hotkey;
+    float                                   m_AspectRatio;
+
+public:
     std::map<CStr, SGUISetting>             m_Settings;
 
+    void SetEnabled(const bool enabled, const bool SkipMessage = false);
+    bool IsEnabled() const { return m_Enabled; }
+
+    void SetHidden(const bool hidden, const bool SkipMessage = false);
+    bool IsHidden() const  { return m_Hidden; }
+
+    void SetAbsolute(const bool absolute, const bool SkipMessage = false);
+    bool IsAbsolute() const { return m_Absolute; }
+
+    void SetGhost(const bool ghost, const bool SkipMessage = false);
+    bool IsGhost() const { return m_Ghost; }
+
+    void SetZ(const float z, const bool SkipMessage = false);
+    float GetZ() const { return m_Z; }
+
+    void SetSize(const CClientArea& size, const bool SkipMessage = false);
+    const CClientArea& GetSize() const { return m_Size; }
+
+    void SetStyle(const CStr& style, const bool SkipMessage = false);
+    const CStr& GetStyle() const { return m_Style; }
+
+    void SetHotkey(const CStr& hotkey, const bool SkipMessage = false);
+    const CStr& GetHotkey() const { return m_Hotkey; }
+
+    void SetAspectRatio(const float aspect_ratio, const bool SkipMessage = false);
+    float GetAspectRatio() const { return m_AspectRatio; }
+
+
 private:
     // An object can't function stand alone
     CGUI                                    *m_pGUI;
 
     // Internal storage for registered script handlers.
     std::map<CStr, JSObject**> m_ScriptHandlers;
-    
+
     // Cached JSObject representing this GUI object
     JSObject                                *m_JSObject;
 };

source/gui/CImage.h

@@ -57 +57 @@
  * without functionality used, and that is a lot of unnecessary
  * overhead. That's why I thought I'd go with an intuitive
  * control.
- * 
+ *
  * @see IGUIObject
  */
 class CImage : public IGUIObject
@@ -73 +73 @@
      * Draws the Image
      */
     virtual void Draw();
+
+private:
+    int                 m_CellId;
+    CGUISpriteInstance  m_Sprite;
+    CStrW               m_Tooltip;
+    CStr                m_TooltipStyle;
+
 };
 
 #endif

source/gui/CCheckBox.h

@@ -50 +50 @@
 
 /**
  * CheckBox
- * 
+ *
  * @see IGUIObject
  * @see IGUISettingsObject
  * @see IGUIButtonBehavior
@@ -84 +84 @@
      * made that can change the visual.
      */
     void SetupText();
+
+private:
+    float               m_BufferZone;
+    CGUIString          m_Caption;
+    int                 m_CellId;
+    CStrW               m_Font;
+    bool                m_Checked;
+    CGUISpriteInstance  m_Sprite;
+    CGUISpriteInstance  m_SpriteOver;
+    CGUISpriteInstance  m_SpritePressed;
+    CGUISpriteInstance  m_SpriteDisabled;
+    CGUISpriteInstance  m_Sprite2;
+    CGUISpriteInstance  m_SpriteOver2;
+    CGUISpriteInstance  m_SpritePressed2;
+    CGUISpriteInstance  m_SpriteDisabled2;
+    float               m_SquareSide;
+    CStrW               m_Tooltip;
+    CStr                m_TooltipStyle;
+
 };
 
 #endif

source/gui/CDropDown.cpp

@@ -32 +32 @@
 //-------------------------------------------------------------------
 CDropDown::CDropDown() : m_Open(false), m_HideScrollBar(false), m_ElementHighlight(-1)
 {
-    AddSetting(GUIST_float,                 "button_width");
-    AddSetting(GUIST_float,                 "dropdown_size");
-    AddSetting(GUIST_float,                 "dropdown_buffer");
+    AddSetting(GUIST_float,                 "button_width",     &m_ButtonWidth);
+    AddSetting(GUIST_float,                 "dropdown_size",    &m_DropdownSize);
+    AddSetting(GUIST_float,                 "dropdown_buffer",  &m_DropdownBuffer);
 //  AddSetting(GUIST_CStrW,                 "font");
 //  AddSetting(GUIST_CGUISpriteInstance,    "sprite");              // Background that sits around the size
-    AddSetting(GUIST_CGUISpriteInstance,    "sprite_list");         // Background of the drop down list
-    AddSetting(GUIST_CGUISpriteInstance,    "sprite2");             // Button that sits to the right
-    AddSetting(GUIST_CGUISpriteInstance,    "sprite2_over");
-    AddSetting(GUIST_CGUISpriteInstance,    "sprite2_pressed");
-    AddSetting(GUIST_CGUISpriteInstance,    "sprite2_disabled");
-    AddSetting(GUIST_EVAlign,               "text_valign");
-    
+    AddSetting(GUIST_CGUISpriteInstance,    "sprite_list",      &m_SpriteList);         // Background of the drop down list
+    AddSetting(GUIST_CGUISpriteInstance,    "sprite2",          &m_Sprite2);                // Button that sits to the right
+    AddSetting(GUIST_CGUISpriteInstance,    "sprite2_over",     &m_SpriteOver2);
+    AddSetting(GUIST_CGUISpriteInstance,    "sprite2_pressed",  &m_SpritePressed2);
+    AddSetting(GUIST_CGUISpriteInstance,    "sprite2_disabled", &m_SpriteDisabled2);
+
     // Add these in CList! And implement TODO
     //AddSetting(GUIST_CColor,              "textcolor_over");
     //AddSetting(GUIST_CColor,              "textcolor_pressed");
@@ -81 +80 @@
             Message.value == "button_width")
         {
             SetupListRect();
-        }       
+        }
 
         break;
     }
@@ -94 +93 @@
 
             if (GetListRect().PointInside(mouse))
             {
-                bool scrollbar;
-                CGUIList *pList;
-                GUI<bool>::GetSetting(this, "scrollbar", scrollbar);
-                GUI<CGUIList>::GetSettingPointer(this, "list", pList);
+                const CGUIList &list_elements = GetList();
                 float scroll=0.f;
-                if (scrollbar)
+                if (IsScrollbar())
                 {
                     scroll = GetScrollBar(0).GetPos();
                 }
@@ -107 +103 @@
                 CRect rect = GetListRect();
                 mouse.y += scroll;
                 int set=-1;
-                for (int i=0; i<(int)pList->m_Items.size(); ++i)
+                for (int i=0; i<(int)list_elements.m_Items.size(); ++i)
                 {
                     if (mouse.y >= rect.top + m_ItemsYPositions[i] &&
                         mouse.y < rect.top + m_ItemsYPositions[i+1] &&
@@ -118 +114 @@
                         set = i;
                     }
                 }
-                
+
                 if (set != -1)
                 {
                     //GUI<int>::SetSetting(this, "selected", set);
@@ -133 +129 @@
 
     case GUIM_MOUSE_LEAVE:
     {
-        GUI<int>::GetSetting(this, "selected", m_ElementHighlight);
+        m_ElementHighlight = GetSelectedIndex();
 
         break;
     }
@@ -142 +138 @@
     // a mouse click to open the dropdown, also the coordinates are changed.
     case GUIM_MOUSE_PRESS_LEFT:
     {
-        bool enabled;
-        GUI<bool>::GetSetting(this, "enabled", enabled);
-        if (!enabled)
+        if (! IsEnabled() )
             break;
 
         if (!m_Open)
@@ -152 +146 @@
             m_Open = true;
             GetScrollBar(0).SetPos(0.f);
             GetScrollBar(0).SetZ(GetBufferedZ());
-            GUI<int>::GetSetting(this, "selected", m_ElementHighlight);
+            m_ElementHighlight = GetSelectedIndex();
             return; // overshadow
         }
         else
@@ -226 +220 @@
     CList::ManuallyHandleEvent(ev);
 
     if (update_highlight)
-        GUI<int>::GetSetting(this, "selected", m_ElementHighlight);
+        m_ElementHighlight = GetSelectedIndex();
 
     return IN_HANDLED;
 }
 
 void CDropDown::SetupListRect()
 {
-    float size, buffer, button_width;
-    GUI<float>::GetSetting(this, "dropdown_size", size);
-    GUI<float>::GetSetting(this, "dropdown_buffer", buffer);
-    GUI<float>::GetSetting(this, "button_width", button_width);
-
-    if (m_ItemsYPositions.empty() || m_ItemsYPositions.back() >= size)
+    if (m_ItemsYPositions.empty() || m_ItemsYPositions.back() >= m_DropdownSize)
     {
-        m_CachedListRect = CRect(m_CachedActualSize.left, m_CachedActualSize.bottom+buffer,
-                                m_CachedActualSize.right, m_CachedActualSize.bottom+buffer + size);
+        m_CachedListRect = CRect(m_CachedActualSize.left, m_CachedActualSize.bottom+m_DropdownBuffer,
+                                m_CachedActualSize.right, m_CachedActualSize.bottom+m_DropdownBuffer + m_DropdownSize);
 
         m_HideScrollBar = false;
     }
     else
     {
-        m_CachedListRect = CRect(m_CachedActualSize.left, m_CachedActualSize.bottom+buffer,
-                                 m_CachedActualSize.right - GetScrollBar(0).GetStyle()->m_Width, m_CachedActualSize.bottom+buffer + m_ItemsYPositions.back());
+        m_CachedListRect = CRect(m_CachedActualSize.left, m_CachedActualSize.bottom+m_DropdownBuffer,
+                                 m_CachedActualSize.right - GetScrollBar(0).GetStyle()->m_Width, m_CachedActualSize.bottom+m_DropdownBuffer + m_ItemsYPositions.back());
 
         // We also need to hide the scrollbar
         m_HideScrollBar = true;
@@ -277 +266 @@
         return m_CachedActualSize.PointInside(GetMousePos());
 }
 
-void CDropDown::Draw() 
+void CDropDown::Draw()
 {
     if (!GetGUI())
         return;
 
     float bz = GetBufferedZ();
 
-    float dropdown_size, button_width;
-    GUI<float>::GetSetting(this, "dropdown_size", dropdown_size);
-    GUI<float>::GetSetting(this, "button_width", button_width);
+    int cell_id = GetCellId();
+    int selected= GetSelectedIndex();
+    const CColor& color = GetTextColor();
 
-    CGUISpriteInstance *sprite, *sprite2, *sprite2_second;
-    int cell_id, selected=0;
-    CColor color;
+    GetGUI()->DrawSprite(GetSprite(), cell_id, bz, m_CachedActualSize);
 
-    GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite", sprite);
-    GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite2", sprite2);
-    GUI<int>::GetSetting(this, "cell_id", cell_id);
-    GUI<int>::GetSetting(this, "selected", selected);
-    GUI<CColor>::GetSetting(this, "textcolor", color);
-
-
-    bool enabled;
-    GUI<bool>::GetSetting(this, "enabled", enabled);
-
-    GetGUI()->DrawSprite(*sprite, cell_id, bz, m_CachedActualSize);
-
-    if (button_width > 0.f)
+    if (m_ButtonWidth > 0.f)
     {
-        CRect rect(m_CachedActualSize.right-button_width, m_CachedActualSize.top,
+        CRect rect(m_CachedActualSize.right-m_ButtonWidth, m_CachedActualSize.top,
                    m_CachedActualSize.right, m_CachedActualSize.bottom);
 
-        if (!enabled)
+        if (! IsEnabled() )
         {
-            GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite2_disabled", sprite2_second);
-            GetGUI()->DrawSprite(GUI<>::FallBackSprite(*sprite2_second, *sprite2), cell_id, bz+0.05f, rect);
+            GetGUI()->DrawSprite(GUI<>::FallBackSprite(m_SpriteDisabled2, m_Sprite2), cell_id, bz+0.05f, rect);
         }
         else
         if (m_Open)
         {
-            GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite2_pressed", sprite2_second);
-            GetGUI()->DrawSprite(GUI<>::FallBackSprite(*sprite2_second, *sprite2), cell_id, bz+0.05f, rect);
+            GetGUI()->DrawSprite(GUI<>::FallBackSprite(m_SpritePressed2, m_Sprite2), cell_id, bz+0.05f, rect);
         }
         else
         if (m_MouseHovering)
         {
-            GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite2_over", sprite2_second);
-            GetGUI()->DrawSprite(GUI<>::FallBackSprite(*sprite2_second, *sprite2), cell_id, bz+0.05f, rect);
+            GetGUI()->DrawSprite(GUI<>::FallBackSprite(m_SpriteOver2, m_Sprite2), cell_id, bz+0.05f, rect);
         }
-        else 
-            GetGUI()->DrawSprite(*sprite2, cell_id, bz+0.05f, rect);
+        else
+            GetGUI()->DrawSprite(m_Sprite2, cell_id, bz+0.05f, rect);
     }
 
     if (selected != -1) // TODO: Maybe check validity completely?
     {
         // figure out clipping rectangle
         CRect cliparea(m_CachedActualSize.left, m_CachedActualSize.top,
-                       m_CachedActualSize.right-button_width, m_CachedActualSize.bottom);
+                       m_CachedActualSize.right-m_ButtonWidth, m_CachedActualSize.bottom);
 
         CPos pos(m_CachedActualSize.left, m_CachedActualSize.top);
         IGUITextOwner::Draw(selected, color, pos, bz+0.1f, cliparea);
     }
 
-    bool *scrollbar=NULL, old;
-    GUI<bool>::GetSettingPointer(this, "scrollbar", scrollbar);
-
-    old = *scrollbar;
-
     if (m_Open)
     {
+        bool old = IsScrollbar();
         if (m_HideScrollBar)
-            *scrollbar = false;
+            SetScrollbar( false );
 
-        DrawList(m_ElementHighlight, "sprite_list", "sprite_selectarea", "textcolor");
-        
+        DrawList(m_ElementHighlight, m_SpriteList);
+
         if (m_HideScrollBar)
-            *scrollbar = old;
+            SetScrollbar(old);
     }
 }
 

source/gui/CTooltip.h

@@ -46 +46 @@
     virtual void HandleMessage(SGUIMessage &Message);
 
     virtual void Draw();
+private:
+    float               m_BufferZone;
+    CGUIString          m_Caption;
+    CStrW               m_Font;
+    CGUISpriteInstance  m_Sprite;
+    CColor              m_TextColor;
+    int                 m_Delay;
+    float               m_MaxWidth;
+    CPos                m_Offset;
+    EVAlign             m_Anchor;
+    CStr                m_UseObject;
+    bool                m_HideObject;
+    CPos                m_MousePos;
 };
 
 #endif

source/gui/CInput.h

@@ -82 +82 @@
     int GetMouseHoveringTextPosition();
 
     // Same as above, but only on one row in X, and a given value, not the mouse's
-    //  wanted is filled with x if the row didn't extend as far as we 
+    //  wanted is filled with x if the row didn't extend as far as we
     int GetXTextPosition(const std::list<SRow>::iterator &c, const float &x, float &wanted);
 
 protected:
@@ -137 +137 @@
     void UpdateAutoScroll();
 
 protected:
-    // Cursor position 
+    // Cursor position
     //  (the second one is for selection of larger areas, -1 if not used)
     // A note on 'Tail', it was first called 'To', and the natural order
     //  of X and X_To was X then X_To. Now Tail is called so, because it
@@ -182 +182 @@
 
     // *** Things for one-line input control *** //
     float m_HorizontalScroll;
+private:
+    float               m_BufferZone;
+    CStrW               m_Caption;
+    int                 m_CellId;
+    CStrW               m_Font;
+    int                 m_MaxLength;
+    bool                m_Multiline;
+    bool                m_Scrollbar;
+    CStr                m_ScrollbarStyle;
+    CGUISpriteInstance  m_Sprite;
+    CGUISpriteInstance  m_SpriteSelectArea;
+    CColor              m_TextColor;
+    CColor              m_TextColorSelected;
+    CStrW               m_Tooltip;
+    CStr                m_TooltipStyle;
+
+
 };
 
 #endif

source/gui/IGUITextOwner.cpp

@@ -28 +28 @@
 //-------------------------------------------------------------------
 IGUITextOwner::IGUITextOwner() : m_GeneratedTextsValid(false)
 {
+    AddSetting(GUIST_EAlign,                "text_align",        &m_TextAlign);
+    AddSetting(GUIST_EVAlign,               "text_valign",       &m_TextVAlign);
+
+    m_TextAlign = EAlign_Left;
+    m_TextVAlign = EVAlign_Top;
 }
 
 IGUITextOwner::~IGUITextOwner()
@@ -101 +106 @@
 
 void IGUITextOwner::CalculateTextPosition(CRect &ObjSize, CPos &TextPos, SGUIText &Text)
 {
-    EAlign align;
-    EVAlign valign;
-    GUI<EAlign>::GetSetting(this, "text_align", align);
-    GUI<EVAlign>::GetSetting(this, "text_valign", valign);
-
-    switch (align)
+    switch (m_TextAlign)
     {
     case EAlign_Left:
         TextPos.x = ObjSize.left;
@@ -123 +123 @@
         break;
     }
 
-    switch (valign)
+    switch (m_TextVAlign)
     {
     case EVAlign_Top:
         TextPos.y = ObjSize.top;

source/gui/CList.cpp

@@ -34 +34 @@
 CList::CList()
 {
     // Add sprite_disabled! TODO
-
-    AddSetting(GUIST_float,                 "buffer_zone");
+    AddSetting(GUIST_float,                 "buffer_zone",       &m_BufferZone);
     //AddSetting(GUIST_CGUIString,          "caption"); will it break removing this? If I know my system, then no, but test just in case TODO (Gee).
-    AddSetting(GUIST_CStrW,                 "font");
-    AddSetting(GUIST_bool,                  "scrollbar");
-    AddSetting(GUIST_CStr,                  "scrollbar_style");
-    AddSetting(GUIST_CGUISpriteInstance,    "sprite");
-    AddSetting(GUIST_CGUISpriteInstance,    "sprite_selectarea");
-    AddSetting(GUIST_int,                   "cell_id");
-    AddSetting(GUIST_EAlign,                "text_align");
-    AddSetting(GUIST_CColor,                "textcolor");
-    AddSetting(GUIST_CColor,                "textcolor_selected");
-    AddSetting(GUIST_int,                   "selected");    // Index selected. -1 is none.
-    AddSetting(GUIST_CStrW,                 "tooltip");
-    AddSetting(GUIST_CStr,                  "tooltip_style");
+    AddSetting(GUIST_int,                   "cell_id",           &m_CellId);
+    AddSetting(GUIST_CStrW,                 "font",              &m_Font);
+    AddSetting(GUIST_bool,                  "scrollbar",         &m_Scrollbar);
+    AddSetting(GUIST_CStr,                  "scrollbar_style",   &m_ScrollbarStyle);
+    AddSetting(GUIST_CGUISpriteInstance,    "sprite",            &m_Sprite);
+    AddSetting(GUIST_CGUISpriteInstance,    "sprite_selectarea", &m_SpriteSelectArea);
+    AddSetting(GUIST_CColor,                "textcolor",         &m_TextColor);
+    AddSetting(GUIST_CColor,                "textcolor_selected",&m_TextSelected);
+    AddSetting(GUIST_int,                   "selected",          &m_Selected);  // Index selected. -1 is none.
+    AddSetting(GUIST_CStrW,                 "tooltip",           &m_Tooltip);
+    AddSetting(GUIST_CStr,                  "tooltip_style",     &m_TooltipStyle);
     // Each list item has both a name (in 'list') and an associated data string (in 'list_data')
-    AddSetting(GUIST_CGUIList,              "list");
-    AddSetting(GUIST_CGUIList,              "list_data"); // TODO: this should be a list of raw strings, not of CGUIStrings
+    AddSetting(GUIST_CGUIList,              "list",              &m_List);
+    AddSetting(GUIST_CGUIList,              "list_data",         &m_ListData); // TODO: this should be a list of raw strings, not of CGUIStrings
 
+    m_BufferZone = 0.f;
+    m_Font = L"default";
+    //m_Scrollbar = false;
+    //m_Selected = -1;
+
     GUI<bool>::SetSetting(this, "scrollbar", false);
 
     // Nothing is selected as default.
@@ -74 +77 @@
     if (!GetGUI())
         return;
 
-    CGUIList *pList;
-    GUI<CGUIList>::GetSettingPointer(this, "list", pList);
-
     //ENSURE(m_GeneratedTexts.size()>=1);
 
-    m_ItemsYPositions.resize( pList->m_Items.size()+1 );
+    m_ItemsYPositions.resize( m_List.m_Items.size()+1 );
 
     // Delete all generated texts. Some could probably be saved,
     //  but this is easier, and this function will never be called
@@ -92 +92 @@
     }
     m_GeneratedTexts.clear();
 
-    CStrW font;
-    if (GUI<CStrW>::GetSetting(this, "font", font) != PSRETURN_OK || font.empty())
-        // Use the default if none is specified
-        // TODO Gee: (2004-08-14) Don't define standard like this. Do it with the default style.
-        font = L"default";
-
-    //CGUIString caption;
-    bool scrollbar;
-    //GUI<CGUIString>::GetSetting(this, "caption", caption);
-    GUI<bool>::GetSetting(this, "scrollbar", scrollbar);
-
     float width = GetListRect().GetWidth();
     // remove scrollbar if applicable
-    if (scrollbar && GetScrollBar(0).GetStyle())
+    if (m_Scrollbar && GetScrollBar(0).GetStyle())
         width -= GetScrollBar(0).GetStyle()->m_Width;
 
-    float buffer_zone=0.f;
-    GUI<float>::GetSetting(this, "buffer_zone", buffer_zone);
-
     // Generate texts
     float buffered_y = 0.f;
-    
-    for (int i=0; i<(int)pList->m_Items.size(); ++i)
+
+    for (int i=0; i<(int)m_List.m_Items.size(); ++i)
     {
         // Create a new SGUIText. Later on, input it using AddText()
         SGUIText *text = new SGUIText();
 
-        *text = GetGUI()->GenerateText(pList->m_Items[i], font, width, buffer_zone, this);
+        *text = GetGUI()->GenerateText(m_List.m_Items[i], m_Font, width, m_BufferZone, this);
 
         m_ItemsYPositions[i] = buffered_y;
         buffered_y += text->m_Size.cy;
@@ -127 +113 @@
         AddText(text);
     }
 
-    m_ItemsYPositions[pList->m_Items.size()] = buffered_y;
-    
+    m_ItemsYPositions[m_List.m_Items.size()] = buffered_y;
+
     //if (! scrollbar)
     //  CalculateTextPosition(m_CachedActualSize, m_TextPos, *m_GeneratedTexts[0]);
 
     // Setup scrollbar
-    if (scrollbar)
+    if (m_Scrollbar)
     {
         GetScrollBar(0).SetScrollRange( m_ItemsYPositions.back() );
         GetScrollBar(0).SetScrollSpace( GetListRect().GetHeight() );
@@ -165 +151 @@
             // TODO: Check range
 
             // TODO only works if lower-case, shouldn't it be made case sensitive instead?
-            ScriptEvent("selectionchange"); 
+            ScriptEvent("selectionchange");
         }
 
         if (Message.value == "scrollbar")
@@ -176 +162 @@
         // Update scrollbar
         if (Message.value == "scrollbar_style")
         {
-            CStr scrollbar_style;
-            GUI<CStr>::GetSetting(this, Message.value, scrollbar_style);
+            GetScrollBar(0).SetScrollBarStyle( m_ScrollbarStyle );
 
-            GetScrollBar(0).SetScrollBarStyle( scrollbar_style );
-
             SetupText();
         }
 
@@ -188 +171 @@
 
     case GUIM_MOUSE_PRESS_LEFT:
     {
-        bool enabled;
-        GUI<bool>::GetSetting(this, "enabled", enabled);
-        if (!enabled)
+        if (!IsEnabled())
             break;
 
-        bool scrollbar;
-        CGUIList *pList;
-        GUI<bool>::GetSetting(this, "scrollbar", scrollbar);
-        GUI<CGUIList>::GetSettingPointer(this, "list", pList);
         float scroll=0.f;
-        if (scrollbar)
+        if (m_Scrollbar)
         {
             scroll = GetScrollBar(0).GetPos();
         }
@@ -207 +184 @@
         CPos mouse = GetMousePos();
         mouse.y += scroll;
         int set=-1;
-        for (int i=0; i<(int)pList->m_Items.size(); ++i)
+        for (int i=0; i<(int)m_List.m_Items.size(); ++i)
         {
             if (mouse.y >= rect.top + m_ItemsYPositions[i] &&
                 mouse.y < rect.top + m_ItemsYPositions[i+1] &&
@@ -218 +195 @@
                 set = i;
             }
         }
-        
+
         if (set != -1)
         {
+            // keep this for now
             GUI<int>::SetSetting(this, "selected", set);
+
             UpdateAutoScroll();
         }
     }   break;
@@ -246 +225 @@
         }
     case GUIM_LOAD:
         {
-        CStr scrollbar_style;
-        GUI<CStr>::GetSetting(this, "scrollbar_style", scrollbar_style);
-        GetScrollBar(0).SetScrollBarStyle( scrollbar_style );
+        GetScrollBar(0).SetScrollBarStyle( m_ScrollbarStyle );
         }
         break;
 
@@ -300 +277 @@
     return IN_HANDLED;
 }
 
-void CList::Draw() 
+void CList::Draw()
 {
-    int selected;
-    GUI<int>::GetSetting(this, "selected", selected);
-    
-    DrawList(selected, "sprite", "sprite_selectarea", "textcolor");
+    DrawList(m_Selected, m_Sprite);
 }
 
 void CList::DrawList(const int &selected,
-                     const CStr& _sprite, 
-                     const CStr& _sprite_selected, 
-                     const CStr& _textcolor)
+                     const CGUISpriteInstance& sprite)
 {
-    float bz = GetBufferedZ();
-
     // First call draw on ScrollBarOwner
-    bool scrollbar;
-    GUI<bool>::GetSetting(this, "scrollbar", scrollbar);
 
-    if (scrollbar)
+    if (m_Scrollbar)
     {
         // Draw scrollbar
         IGUIScrollBarOwner::Draw();
@@ -327 +295 @@
 
     if (GetGUI())
     {
+        float bz = GetBufferedZ();
         CRect rect = GetListRect();
 
-        CGUISpriteInstance *sprite=NULL, *sprite_selectarea=NULL;
-        int cell_id;
-        GUI<CGUISpriteInstance>::GetSettingPointer(this, _sprite, sprite);
-        GUI<CGUISpriteInstance>::GetSettingPointer(this, _sprite_selected, sprite_selectarea);
-        GUI<int>::GetSetting(this, "cell_id", cell_id);
+        GetGUI()->DrawSprite(sprite, m_CellId, bz, rect);
 
-        CGUIList *pList;
-        GUI<CGUIList>::GetSettingPointer(this, "list", pList);
-
-        GetGUI()->DrawSprite(*sprite, cell_id, bz, rect);
-
         float scroll=0.f;
-        if (scrollbar)
+        if (m_Scrollbar)
         {
             scroll = GetScrollBar(0).GetPos();
         }
@@ -362 +322 @@
                 if (rect_sel.top < rect.top)
                     rect_sel.top = rect.top;
 
-                if (scrollbar)
+                if (m_Scrollbar)
                 {
                     // Remove any overlapping area of the scrollbar.
                     if (rect_sel.right > GetScrollBar(0).GetOuterRect().left &&
@@ -374 +334 @@
                         rect_sel.left = GetScrollBar(0).GetOuterRect().right;
                 }
 
-                GetGUI()->DrawSprite(*sprite_selectarea, cell_id, bz+0.05f, rect_sel);
+                GetGUI()->DrawSprite(m_SpriteSelectArea, m_CellId, bz+0.05f, rect_sel);
             }
         }
 
-        CColor color;
-        GUI<CColor>::GetSetting(this, _textcolor, color);
-
-        for (int i=0; i<(int)pList->m_Items.size(); ++i)
+        for (int i=0; i<(int)m_List.m_Items.size(); ++i)
         {
             if (m_ItemsYPositions[i+1] - scroll < 0 ||
                 m_ItemsYPositions[i] - scroll > rect.GetHeight())
@@ -390 +347 @@
             // Clipping area (we'll have to substract the scrollbar)
             CRect cliparea = GetListRect();
 
-            if (scrollbar)
+            if (m_Scrollbar)
             {
                 if (cliparea.right > GetScrollBar(0).GetOuterRect().left &&
                     cliparea.right <= GetScrollBar(0).GetOuterRect().right)
@@ -401 +358 @@
                     cliparea.left = GetScrollBar(0).GetOuterRect().right;
             }
 
-            IGUITextOwner::Draw(i, color, rect.TopLeft() - CPos(0.f, scroll - m_ItemsYPositions[i]), 
+            IGUITextOwner::Draw(i, m_TextColor, rect.TopLeft() - CPos(0.f, scroll - m_ItemsYPositions[i]),
                                 bz+0.1f, cliparea);
         }
     }
@@ -409 +366 @@
 
 void CList::AddItem(const CStrW& str, const CStrW& data)
 {
-    CGUIList *pList, *pListData;
-    GUI<CGUIList>::GetSettingPointer(this, "list", pList);
-    GUI<CGUIList>::GetSettingPointer(this, "list_data", pListData);
-
     CGUIString gui_string;
     gui_string.SetValue(str);
-    pList->m_Items.push_back( gui_string );
+    m_List.m_Items.push_back( gui_string );
 
     CGUIString data_string;
     data_string.SetValue(data);
-    pListData->m_Items.push_back( data_string );
+    m_ListData.m_Items.push_back( data_string );
 
     // TODO Temp
     SetupText();
@@ -432 +385 @@
     if (child.GetNodeName() == elmt_item)
     {
         AddItem(child.GetText().FromUTF8(), child.GetText().FromUTF8());
-        
+
         return true;
     }
     else
@@ -443 +396 @@
 
 void CList::SelectNextElement()
 {
-    int selected;
-    GUI<int>::GetSetting(this, "selected", selected);
-
-    CGUIList *pList;
-    GUI<CGUIList>::GetSettingPointer(this, "list", pList);
-
-    if (selected != (int)pList->m_Items.size()-1)
+    if (m_Selected != (int)m_List.m_Items.size()-1)
     {
-        ++selected;
-        GUI<int>::SetSetting(this, "selected", selected);
+        SetSelected(m_Selected+1);
     }
 }
-    
+
 void CList::SelectPrevElement()
 {
-    int selected;
-    GUI<int>::GetSetting(this, "selected", selected);
-
-    if (selected != 0)
+    if (m_Selected != 0)
     {
-        --selected;
-        GUI<int>::SetSetting(this, "selected", selected);
+        SetSelected(m_Selected-1);
     }
 }
 
 void CList::SelectFirstElement()
 {
-    int selected;
-    GUI<int>::GetSetting(this, "selected", selected);
-
-    if (selected != 0)
+    if (m_Selected != 0)
     {
-        GUI<int>::SetSetting(this, "selected", 0);
+        SetSelected(0);
     }
 }
-    
+
 void CList::SelectLastElement()
 {
-    int selected;
-    GUI<int>::GetSetting(this, "selected", selected);
-
-    CGUIList *pList;
-    GUI<CGUIList>::GetSettingPointer(this, "list", pList);
-
-    if (selected != (int)pList->m_Items.size()-1)
+    if (m_Selected != (int)m_List.m_Items.size()-1)
     {
-        GUI<int>::SetSetting(this, "selected", (int)pList->m_Items.size()-1);
+        SetSelected(m_List.m_Items.size()-1);
     }
 }
 
 void CList::UpdateAutoScroll()
 {
-    int selected;
-    bool scrollbar;
-    float scroll;
-    GUI<int>::GetSetting(this, "selected", selected);
-    GUI<bool>::GetSetting(this, "scrollbar", scrollbar);
-
-    CRect rect = GetListRect();
-
     // No scrollbar, no scrolling (at least it's not made to work properly).
-    if (!scrollbar)
+    if (!m_Scrollbar)
         return;
 
-    scroll = GetScrollBar(0).GetPos();
+    float scroll = GetScrollBar(0).GetPos();
 
+    CRect rect = GetListRect();
+
     // Check upper boundary
-    if (m_ItemsYPositions[selected] < scroll)
+    if (m_ItemsYPositions[m_Selected] < scroll)
     {
-        GetScrollBar(0).SetPos(m_ItemsYPositions[selected]);
+        GetScrollBar(0).SetPos(m_ItemsYPositions[m_Selected]);
         return; // this means, if it wants to align both up and down at the same time
                 //  this will have precedence.
     }
 
     // Check lower boundary
-    if (m_ItemsYPositions[selected+1]-rect.GetHeight() > scroll)
+    if (m_ItemsYPositions[m_Selected+1]-rect.GetHeight() > scroll)
     {
-        GetScrollBar(0).SetPos(m_ItemsYPositions[selected+1]-rect.GetHeight());
+        GetScrollBar(0).SetPos(m_ItemsYPositions[m_Selected+1]-rect.GetHeight());
     }
 }
+
+void CList::SetSelected(const int index, const bool SkipMessage)
+{
+    m_Selected = index;
+    if (!SkipMessage)
+    {
+        SGUIMessage msg(GUIM_SETTINGS_UPDATED, "selected");
+        HandleMessage( msg );
+    }
+}
+
+void CList::SetScrollbar(const bool scrollbar, const bool SkipMessage)
+{
+    m_Scrollbar = scrollbar;
+    if (!SkipMessage)
+    {
+        SGUIMessage msg(GUIM_SETTINGS_UPDATED, "scrollbar");
+        HandleMessage( msg );
+    }
+}

source/gui/IGUIButtonBehavior.h

@@ -124 +124 @@
      * this lets us know we are done with step one (clicking).
      */
     bool                            m_Pressed;
+private:
+    CColor                          m_ButtonTextColor;
+    CColor                          m_ButtonTextColorOver;
+    CColor                          m_ButtonTextColorPressed;
+    CColor                          m_ButtonTextColorDisabled;
+
 };
 
 #endif

source/gui/GUIutil.cpp

@@ -392 +392 @@
             QueryResetting(pObject);
     }
 
-    if (!SkipMessage)
+    if (!SkipMessage) // XXX has to send msg when some changes.
     {
         SGUIMessage msg(GUIM_SETTINGS_UPDATED, Setting);
         HandleMessage(pObject, msg);

source/gui/CButton.h

@@ -50 +50 @@
 
 /**
  * Button
- * 
+ *
  * @see IGUIObject
  * @see IGUIButtonBehavior
  */
@@ -88 +88 @@
      * Placement of text.
      */
     CPos m_TextPos;
+
+private:
+    float               m_BufferZone;
+    CGUIString          m_Caption;
+    int                 m_CellId;
+    CStrW               m_Font;
+    CGUISpriteInstance  m_Sprite;
+    CGUISpriteInstance  m_SpriteOver;
+    CGUISpriteInstance  m_SpritePressed;
+    CGUISpriteInstance  m_SpriteDisabled;
+    CStrW               m_Tooltip;
+    CStr                m_TooltipStyle;
 };
 
 #endif

source/gui/IGUIObject.cpp

@@ -40 +40 @@
 //-------------------------------------------------------------------
 //  Constructor / Destructor
 //-------------------------------------------------------------------
-IGUIObject::IGUIObject() : 
-    m_pGUI(NULL), 
+IGUIObject::IGUIObject() :
+    m_pGUI(NULL),
     m_pParent(NULL),
     m_MouseHovering(false),
     m_JSObject(NULL)
 {
-    AddSetting(GUIST_bool,          "enabled");
-    AddSetting(GUIST_bool,          "hidden");
-    AddSetting(GUIST_CClientArea,   "size");
-    AddSetting(GUIST_CStr,          "style");
-    AddSetting(GUIST_CStr,          "hotkey" );
-    AddSetting(GUIST_float,         "z");
-    AddSetting(GUIST_bool,          "absolute");
-    AddSetting(GUIST_bool,          "ghost");
-    AddSetting(GUIST_float,         "aspectratio");
+    AddSetting(GUIST_bool,          "enabled",      &m_Enabled);
+    AddSetting(GUIST_bool,          "hidden",       &m_Hidden);
+    AddSetting(GUIST_CClientArea,   "size",         &m_Size);
+    AddSetting(GUIST_CStr,          "style",        &m_Style);
+    AddSetting(GUIST_CStr,          "hotkey",       &m_Hotkey);
+    AddSetting(GUIST_float,         "z",            &m_Z);
+    AddSetting(GUIST_bool,          "absolute",     &m_Absolute);
+    AddSetting(GUIST_bool,          "ghost",        &m_Ghost);
+    AddSetting(GUIST_float,         "aspectratio",  &m_AspectRatio);
 
     // Setup important defaults
-    GUI<bool>::SetSetting(this, "hidden", false);
-    GUI<bool>::SetSetting(this, "ghost", false);
-    GUI<bool>::SetSetting(this, "enabled", true);
-    GUI<bool>::SetSetting(this, "absolute", true);
+//  GUI<bool>::SetSetting(this, "hidden", false);
+    SetHidden(false);
+//  GUI<bool>::SetSetting(this, "ghost", false);
+    SetGhost(false);
+//  GUI<bool>::SetSetting(this, "enabled", true);
+    SetEnabled(true);
+//  GUI<bool>::SetSetting(this, "absolute", true);
+    SetAbsolute(true);
 
+    SetAspectRatio(0.f);
 
+
     for (int i=0; i<6; i++)
         m_LastClickTime[i]=0;
 }
@@ -73 +79 @@
         std::map<CStr, SGUISetting>::iterator it;
         for (it = m_Settings.begin(); it != m_Settings.end(); ++it)
         {
-            switch (it->second.m_Type)
+            if ( it->second.m_dynamic )
             {
-                // delete() needs to know the type of the variable - never delete a void*
+                // delete only the settings we created
+                switch (it->second.m_Type)
+                {
+                    // delete() needs to know the type of the variable - never delete a void*
 #define TYPE(t) case GUIST_##t: delete (t*)it->second.m_pSetting; break;
 #include "GUItypes.h"
 #undef TYPE
-        default:
-            debug_warn(L"Invalid setting type");
+                    default:
+                        debug_warn(L"Invalid setting type");
+                }
             }
         }
     }
@@ -93 +103 @@
             delete it->second;
         }
     }
-    
+
     if (m_JSObject)
         JS_RemoveObjectRoot(g_ScriptingHost.getContext(), &m_JSObject);
 }
@@ -103 +113 @@
 //-------------------------------------------------------------------
 void IGUIObject::AddChild(IGUIObject *pChild)
 {
-    // 
+    //
 //  ENSURE(pChild);
 
     pChild->SetParent(this);
@@ -128 +138 @@
             // If anything went wrong, reverse what we did and throw
             //  an exception telling it never added a child
             m_Children.erase( m_Children.end()-1 );
-            
+
             throw;
         }
     }
@@ -166 +176 @@
 // Notice if using this, the naming convention of GUIST_ should be strict.
 #define TYPE(type)                                  \
     case GUIST_##type:                              \
-        m_Settings[Name].m_pSetting = new type();   \
+        setting.m_pSetting = new type();    \
         break;
 
-void IGUIObject::AddSetting(const EGUISettingType &Type, const CStr& Name)
+void IGUIObject::AddSetting(const EGUISettingType &Type, const CStr& Name, void * Pointer)
 {
     // Is name already taken?
     if (m_Settings.count(Name) >= 1)
         return;
 
     // Construct, and set type
-    m_Settings[Name].m_Type = Type;
-
-    switch (Type)
+    SGUISetting& setting = m_Settings[Name];
+    setting.m_Type = Type;
+    if ( Pointer != 0 )
     {
-        // Construct the setting.
-        #include "GUItypes.h"
+        setting.m_dynamic = false;
+        setting.m_pSetting = Pointer;
+    }
+    else
+    {
+        setting.m_dynamic = true;
 
-    default:
-        debug_warn(L"IGUIObject::AddSetting failed, type not recognized!");
-        break;
+        switch (Type)
+        {
+            // Construct the setting.
+            #include "GUItypes.h"
+
+        default:
+            debug_warn(L"IGUIObject::AddSetting failed, type not recognized!");
+            break;
+        }
     }
 }
 #undef TYPE
@@ -205 +225 @@
 }
 
 CPos IGUIObject::GetMousePos() const
-{ 
-    return ((GetGUI())?(GetGUI()->m_MousePos):CPos()); 
+{
+    return ((GetGUI())?(GetGUI()->m_MousePos):CPos());
 }
 
 void IGUIObject::UpdateMouseOver(IGUIObject * const &pMouseOver)
@@ -335 +355 @@
 
 void IGUIObject::UpdateCachedSize()
 {
-    bool absolute;
-    GUI<bool>::GetSetting(this, "absolute", absolute);
+//  bool absolute;
+//  GUI<bool>::GetSetting(this, "absolute", absolute);
 
-    float aspectratio = 0.f;
-    GUI<float>::GetSetting(this, "aspectratio", aspectratio);
+//  float aspectratio = 0.f;
+//  GUI<float>::GetSetting(this, "aspectratio", aspectratio);
 
-    CClientArea ca;
-    GUI<CClientArea>::GetSetting(this, "size", ca);
-    
+//  CClientArea ca;
+//  GUI<CClientArea>::GetSetting(this, "size", ca);
+
     // If absolute="false" and the object has got a parent,
     //  use its cached size instead of the screen. Notice
     //  it must have just been cached for it to work.
-    if (absolute == false && m_pParent && !IsRootObject())
-        m_CachedActualSize = ca.GetClientArea(m_pParent->m_CachedActualSize);
+    if ( m_Absolute == false && m_pParent && !IsRootObject())
+        m_CachedActualSize = m_Size.GetClientArea(m_pParent->m_CachedActualSize);
     else
-        m_CachedActualSize = ca.GetClientArea(CRect(0.f, 0.f, (float)g_xres, (float)g_yres));
+        m_CachedActualSize = m_Size.GetClientArea(CRect(0.f, 0.f, (float)g_xres, (float)g_yres));
 
     // In a few cases, GUI objects have to resize to fill the screen
     // but maintain a constant aspect ratio.
     // Adjust the size to be the max possible, centered in the original size:
-    if (aspectratio)
+    if (m_AspectRatio)
     {
-        if (m_CachedActualSize.GetWidth() > m_CachedActualSize.GetHeight()*aspectratio)
+        if (m_CachedActualSize.GetWidth() > m_CachedActualSize.GetHeight()*m_AspectRatio)
         {
-            float delta = m_CachedActualSize.GetWidth() - m_CachedActualSize.GetHeight()*aspectratio;
+            float delta = m_CachedActualSize.GetWidth() - m_CachedActualSize.GetHeight()*m_AspectRatio;
             m_CachedActualSize.left += delta/2.f;
             m_CachedActualSize.right -= delta/2.f;
         }
         else
         {
-            float delta = m_CachedActualSize.GetHeight() - m_CachedActualSize.GetWidth()/aspectratio;
+            float delta = m_CachedActualSize.GetHeight() - m_CachedActualSize.GetWidth()/m_AspectRatio;
             m_CachedActualSize.bottom -= delta/2.f;
             m_CachedActualSize.top += delta/2.f;
         }
@@ -405 +425 @@
 
 float IGUIObject::GetBufferedZ() const
 {
-    bool absolute;
-    GUI<bool>::GetSetting(this, "absolute", absolute);
+//  bool absolute;
+//  GUI<bool>::GetSetting(this, "absolute", absolute);
 
-    float Z;
-    GUI<float>::GetSetting(this, "z", Z);
+//  float Z;
+//  GUI<float>::GetSetting(this, "z", Z);
 
-    if (absolute)
-        return Z;
+    if ( m_Absolute )
+        return m_Z;
     else
     {
         if (GetParent())
-            return GetParent()->GetBufferedZ() + Z;
+            return GetParent()->GetBufferedZ() + m_Z;
         else
         {
             // In philosophy, a parentless object shouldn't be able to have a relative sizing,
-            //  but we'll accept it so that absolute can be used as default without a complaint. 
+            //  but we'll accept it so that absolute can be used as default without a complaint.
             //  Also, you could consider those objects children to the screen resolution.
-            return Z;
+            return m_Z;
         }
     }
 }
@@ -430 +450 @@
 // TODO Gee: keep this function and all???
 void IGUIObject::CheckSettingsValidity()
 {
-    bool hidden;
-    GUI<bool>::GetSetting(this, "hidden", hidden);
+//  bool hidden;
+//  GUI<bool>::GetSetting(this, "hidden", hidden);
 
     // If we hide an object, reset many of its parts
-    if (hidden)
+    if ( m_Hidden )
     {
         // Simulate that no object is hovered for this object and all its children
-        //  why? because it's 
+        //  why? because it's
         try
         {
             GUI<IGUIObject*>::RecurseObject(0, this, &IGUIObject::UpdateMouseOver, NULL);
@@ -574 +594 @@
 
 void IGUIObject::SetFocus()
 {
-    GetGUI()->m_FocusedObject = this; 
+    GetGUI()->m_FocusedObject = this;
 }
 
 bool IGUIObject::IsFocused() const
 {
-    return GetGUI()->m_FocusedObject == this; 
+    return GetGUI()->m_FocusedObject == this;
 }
 
 bool IGUIObject::IsRootObject() const
@@ -589 +609 @@
 
 PSRETURN IGUIObject::LogInvalidSettings(const CStr8 &Setting) const
 {
-    LOGWARNING(L"IGUIObject: setting %hs was not found on an object", 
+    LOGWARNING(L"IGUIObject: setting %hs was not found on an object",
         Setting.c_str());
     return PSRETURN_GUI_InvalidSetting;
 }
+
+
+void IGUIObject::SetEnabled(const bool enabled, const bool SkipMessage)
+{
+    m_Enabled = enabled;
+    if (!SkipMessage)
+    {
+        SGUIMessage msg(GUIM_SETTINGS_UPDATED, "enabled");
+        HandleMessage( msg );
+    }
+}
+
+void IGUIObject::SetHidden(const bool hidden, const bool SkipMessage)
+{
+    m_Hidden = hidden;
+    if ( hidden )
+        CInternalCGUIAccessorBase::QueryResetting(this);
+
+    if (!SkipMessage)
+    {
+        SGUIMessage msg(GUIM_SETTINGS_UPDATED, "hidden");
+        HandleMessage( msg );
+    }
+}
+
+void IGUIObject::SetAbsolute(const bool absolute, const bool SkipMessage)
+{
+    m_Absolute = absolute;
+    if (!SkipMessage)
+    {
+        SGUIMessage msg(GUIM_SETTINGS_UPDATED, "absolute");
+        HandleMessage( msg );
+    }
+}
+
+void IGUIObject::SetGhost(const bool ghost, const bool SkipMessage)
+{
+    m_Ghost = ghost;
+    if (!SkipMessage)
+    {
+        SGUIMessage msg(GUIM_SETTINGS_UPDATED, "ghost");
+        HandleMessage( msg );
+    }
+}
+
+void IGUIObject::SetZ(const float z, const bool SkipMessage)
+{
+    m_Z = z;
+    if (!SkipMessage)
+    {
+        SGUIMessage msg(GUIM_SETTINGS_UPDATED, "z");
+        HandleMessage( msg );
+    }
+}
+
+void IGUIObject::SetSize(const CClientArea& size, const bool SkipMessage)
+{
+    m_Size = size;
+    GUI<>::RecurseObject(0, this, &IGUIObject::UpdateCachedSize);
+
+    if (!SkipMessage)
+    {
+        SGUIMessage msg(GUIM_SETTINGS_UPDATED, "size");
+        HandleMessage( msg );
+    }
+}
+
+void IGUIObject::SetStyle(const CStr& style, const bool SkipMessage)
+{
+    m_Style = style;
+    if (!SkipMessage)
+    {
+        SGUIMessage msg(GUIM_SETTINGS_UPDATED, "style");
+        HandleMessage( msg );
+    }
+}
+
+void IGUIObject::SetHotkey(const CStr& hotkey, const bool SkipMessage)
+{
+    m_Hotkey = hotkey;
+    if (!SkipMessage)
+    {
+        SGUIMessage msg(GUIM_SETTINGS_UPDATED, "hotkey");
+        HandleMessage( msg );
+    }
+}
+
+void IGUIObject::SetAspectRatio(const float aspect_ratio, const bool SkipMessage)
+{
+    m_AspectRatio = aspect_ratio;
+    if (!SkipMessage)
+    {
+        SGUIMessage msg(GUIM_SETTINGS_UPDATED, "aspectratio");
+        HandleMessage( msg );
+    }
+}

source/gui/CImage.cpp

@@ -31 +31 @@
 //-------------------------------------------------------------------
 CImage::CImage()
 {
-    AddSetting(GUIST_CGUISpriteInstance,    "sprite");
-    AddSetting(GUIST_int,                   "cell_id");
-    AddSetting(GUIST_CStrW,                 "tooltip");
-    AddSetting(GUIST_CStr,                  "tooltip_style");
+    AddSetting(GUIST_CGUISpriteInstance,    "sprite",            &m_Sprite);
+    AddSetting(GUIST_int,                   "cell_id",           &m_CellId);
+    AddSetting(GUIST_CStrW,                 "tooltip",           &m_Tooltip);
+    AddSetting(GUIST_CStr,                  "tooltip_style",     &m_TooltipStyle);
 }
 
 CImage::~CImage()
 {
 }
 
-void CImage::Draw() 
+void CImage::Draw()
 {
     if (GetGUI())
     {
         float bz = GetBufferedZ();
-
+/*
         CGUISpriteInstance *sprite;
         int cell_id;
         GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite", sprite);
         GUI<int>::GetSetting(this, "cell_id", cell_id);
-
-        GetGUI()->DrawSprite(*sprite, cell_id, bz, m_CachedActualSize);
+*/
+        GetGUI()->DrawSprite(m_Sprite, m_CellId, bz, m_CachedActualSize);
     }
 }

source/gui/CCheckBox.cpp

@@ -32 +32 @@
 //-------------------------------------------------------------------
 CCheckBox::CCheckBox()
 {
-    AddSetting(GUIST_float,                 "buffer_zone");
-    AddSetting(GUIST_CGUIString,            "caption");
-    AddSetting(GUIST_int,                   "cell_id");
-    AddSetting(GUIST_bool,                  "checked");
-    AddSetting(GUIST_CStrW,                 "font");
-    AddSetting(GUIST_CGUISpriteInstance,    "sprite");
-    AddSetting(GUIST_CGUISpriteInstance,    "sprite_over");
-    AddSetting(GUIST_CGUISpriteInstance,    "sprite_pressed");
-    AddSetting(GUIST_CGUISpriteInstance,    "sprite_disabled");
-    AddSetting(GUIST_CGUISpriteInstance,    "sprite2");
-    AddSetting(GUIST_CGUISpriteInstance,    "sprite2_over");
-    AddSetting(GUIST_CGUISpriteInstance,    "sprite2_pressed");
-    AddSetting(GUIST_CGUISpriteInstance,    "sprite2_disabled");
-    AddSetting(GUIST_float,                 "square_side");
-    AddSetting(GUIST_CColor,                "textcolor");
-    AddSetting(GUIST_CColor,                "textcolor_over");
-    AddSetting(GUIST_CColor,                "textcolor_pressed");
-    AddSetting(GUIST_CColor,                "textcolor_disabled");
-    AddSetting(GUIST_CStrW,                 "tooltip");
-    AddSetting(GUIST_CStr,                  "tooltip_style");
+    AddSetting(GUIST_float,                 "buffer_zone",       &m_BufferZone);
+    AddSetting(GUIST_CGUIString,            "caption",           &m_Caption);
+    AddSetting(GUIST_int,                   "cell_id",           &m_CellId);
+    AddSetting(GUIST_CStrW,                 "font",              &m_Font);
+    AddSetting(GUIST_bool,                  "checked",           &m_Checked);
+    AddSetting(GUIST_CGUISpriteInstance,    "sprite",            &m_Sprite);
+    AddSetting(GUIST_CGUISpriteInstance,    "sprite_over",       &m_SpriteOver);
+    AddSetting(GUIST_CGUISpriteInstance,    "sprite_pressed",    &m_SpritePressed);
+    AddSetting(GUIST_CGUISpriteInstance,    "sprite_disabled",   &m_SpriteDisabled);
+    AddSetting(GUIST_CGUISpriteInstance,    "sprite2",           &m_Sprite2);
+    AddSetting(GUIST_CGUISpriteInstance,    "sprite2_over",      &m_SpriteOver2);
+    AddSetting(GUIST_CGUISpriteInstance,    "sprite2_pressed",   &m_SpritePressed2);
+    AddSetting(GUIST_CGUISpriteInstance,    "sprite2_disabled",  &m_SpriteDisabled2);
+    AddSetting(GUIST_float,                 "square_side",       &m_SquareSide);
+    AddSetting(GUIST_CStrW,                 "tooltip",           &m_Tooltip);
+    AddSetting(GUIST_CStr,                  "tooltip_style",     &m_TooltipStyle);
 
+    m_BufferZone = 0.f;
+    m_Font = L"default";
+    m_Checked = false;
+
     // Add text
     AddText(new SGUIText());
 }
@@ -68 +68 @@
 
     ENSURE(m_GeneratedTexts.size()==1);
 
-    CStrW font;
-    if (GUI<CStrW>::GetSetting(this, "font", font) != PSRETURN_OK || font.empty())
-        // Use the default if none is specified
-        // TODO Gee: (2004-08-14) Default should not be hard-coded, but be in styles!
-        font = L"default";
-
-    float square_side;
-    GUI<float>::GetSetting(this, "square_side", square_side);
-
-    CGUIString caption;
-    GUI<CGUIString>::GetSetting(this, "caption", caption);
-
-    float buffer_zone=0.f;
-    GUI<float>::GetSetting(this, "buffer_zone", buffer_zone);
-    *m_GeneratedTexts[0] = GetGUI()->GenerateText(caption, font, m_CachedActualSize.GetWidth()-square_side, 0.f, this);
+    *m_GeneratedTexts[0] = GetGUI()->GenerateText(m_Caption, m_Font, m_CachedActualSize.GetWidth()- m_SquareSide, 0.f, this);
 }
 
 void CCheckBox::HandleMessage(SGUIMessage &Message)
@@ -100 +86 @@
         GUI<bool>::GetSetting(this, "checked", checked);
         checked = !checked;
         GUI<bool>::SetSetting(this, "checked", checked);
-        
+
     }   break;
 
     default:
@@ -108 +94 @@
     }
 }
 
-void CCheckBox::Draw() 
+void CCheckBox::Draw()
 {
     ////////// Gee: janwas, this is just temp to see it
     glDisable(GL_TEXTURE_2D);
     //////////
 
-    float square_side, buffer_zone;
-    CStrW font_name;
-    bool checked;
-    int cell_id;
-    GUI<float>::GetSetting(this, "square_side", square_side);
-    GUI<float>::GetSetting(this, "buffer_zone", buffer_zone);
-    GUI<CStrW>::GetSetting(this, "font", font_name);
-    GUI<bool>::GetSetting(this, "checked", checked);
-    GUI<int>::GetSetting(this, "cell_id", cell_id);
-
     // Get line height
-    CFont font (font_name);
+    CFont font (m_Font);
     float line_height = (float)font.GetHeight();
 
     float bz = GetBufferedZ();
@@ -134 +110 @@
     CRect rect;
 
     rect.left =     m_CachedActualSize.left;
-    rect.right =    rect.left + square_side;
+    rect.right =    rect.left + m_SquareSide;
 
-    if (square_side >= line_height)
+    if (m_SquareSide >= line_height)
         rect.top =  m_CachedActualSize.top;
     else
-        rect.top =  m_CachedActualSize.top + line_height/2.f - square_side/2.f;
+        rect.top =  m_CachedActualSize.top + line_height/2.f - m_SquareSide/2.f;
 
-    rect.bottom =   rect.top + square_side;
+    rect.bottom =   rect.top + m_SquareSide;
 
-    CGUISpriteInstance *sprite, *sprite_over, *sprite_pressed, *sprite_disabled;
-
-    if (checked)
+    if (m_Checked)
     {
-        GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite2", sprite);
-        GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite2_over", sprite_over);
-        GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite2_pressed", sprite_pressed);
-        GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite2_disabled", sprite_disabled);
+        DrawButton(rect,
+                   bz,
+                   m_Sprite2,
+                   m_SpriteOver2,
+                   m_SpritePressed2,
+                   m_SpriteDisabled2,
+                   m_CellId);
     }
     else
     {
-        GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite", sprite);
-        GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite_over", sprite_over);
-        GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite_pressed", sprite_pressed);
-        GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite_disabled", sprite_disabled);
+        DrawButton(rect,
+                   bz,
+                   m_Sprite,
+                   m_SpriteOver,
+                   m_SpritePressed,
+                   m_SpriteDisabled,
+                   m_CellId);
     }
-
-    DrawButton(rect, 
-               bz,
-               *sprite,
-               *sprite_over,
-               *sprite_pressed,
-               *sprite_disabled,
-               cell_id);
-
     CColor color = ChooseColor();
 
-    CPos text_pos(m_CachedActualSize.left + square_side + buffer_zone, m_CachedActualSize.top);
+    CPos text_pos(m_CachedActualSize.left + m_SquareSide + m_BufferZone, m_CachedActualSize.top);
 
-    if (square_side > line_height)
-        text_pos.y += square_side/2.f - line_height/2.f;
+    if (m_SquareSide > line_height)
+        text_pos.y += m_SquareSide/2.f - line_height/2.f;
 
     IGUITextOwner::Draw(0, color, text_pos, bz+0.1f, m_CachedActualSize);
 }

source/gui/CText.h

@@ -53 +53 @@
 
 /**
  * Text field that just displays static text.
- * 
+ *
  * @see IGUIObject
  */
 class CText : public IGUIScrollBarOwner, public IGUITextOwner
@@ -95 +95 @@
      * Placement of text. Ignored when scrollbars are active.
      */
     CPos m_TextPos;
+private:
+    float               m_BufferZone;
+    CGUIString          m_Caption;
+    int                 m_CellId;
+    bool                m_Clip;
+    CStrW               m_Font;
+    bool                m_Scrollbar;
+    CStr                m_ScrollbarStyle;
+    bool                m_ScrollBottom;
+    CGUISpriteInstance  m_Sprite;
+    CColor              m_TextColor;
+    CStrW               m_Tooltip;
+    CStr                m_TooltipStyle;
+
+    CStrW               m_IconTooltip;
+    CStr                m_IconTooltipStyle;
+
 };
 
 #endif

source/gui/CTooltip.cpp

@@ -26 +26 @@
 
 CTooltip::CTooltip()
 {
-    // If the tooltip is an object by itself:
-    AddSetting(GUIST_float,                 "buffer_zone");
-    AddSetting(GUIST_CGUIString,            "caption");
-    AddSetting(GUIST_CStrW,                 "font");
-    AddSetting(GUIST_CGUISpriteInstance,    "sprite");
-    AddSetting(GUIST_int,                   "delay");
-    AddSetting(GUIST_CColor,                "textcolor");
-    AddSetting(GUIST_float,                 "maxwidth");
-    AddSetting(GUIST_CPos,                  "offset");
-    AddSetting(GUIST_EVAlign,               "anchor");
+    AddSetting(GUIST_float,                 "buffer_zone",      &m_BufferZone);
+    AddSetting(GUIST_CGUIString,            "caption",          &m_Caption);
+    AddSetting(GUIST_CStrW,                 "font",             &m_Font);
+    AddSetting(GUIST_CGUISpriteInstance,    "sprite",           &m_Sprite);
+    AddSetting(GUIST_CColor,                "textcolor",        &m_TextColor);
+    AddSetting(GUIST_int,                   "delay",            &m_Delay);
+    AddSetting(GUIST_float,                 "maxwidth",         &m_MaxWidth);
+    AddSetting(GUIST_CPos,                  "offset",           &m_Offset);
+    AddSetting(GUIST_EVAlign,               "anchor",           &m_Anchor);
 
     // If the tooltip is just a reference to another object:
-    AddSetting(GUIST_CStr,                  "use_object");
-    AddSetting(GUIST_bool,                  "hide_object");
+    AddSetting(GUIST_CStr,                  "use_object",       &m_UseObject);
+    AddSetting(GUIST_bool,                  "hide_object",      &m_HideObject);
 
     // Private settings:
-    AddSetting(GUIST_CPos,                  "_mousepos");
+    AddSetting(GUIST_CPos,                  "_mousepos",        &m_MousePos);
 
+    m_BufferZone = 0.f;
+    m_Font = L"default";
+
     // Defaults
     GUI<int>::SetSetting(this, "delay", 500);
     GUI<EVAlign>::SetSetting(this, "anchor", EVAlign_Bottom);
@@ -64 +66 @@
 
     ENSURE(m_GeneratedTexts.size()==1);
 
-    CStrW font;
-    if (GUI<CStrW>::GetSetting(this, "font", font) != PSRETURN_OK || font.empty())
-        font = L"default";
+    *m_GeneratedTexts[0] = GetGUI()->GenerateText(m_Caption, m_Font, m_MaxWidth, m_BufferZone, this);
 
-    float buffer_zone = 0.f;
-    GUI<float>::GetSetting(this, "buffer_zone", buffer_zone);
-
-    CGUIString caption;
-    GUI<CGUIString>::GetSetting(this, "caption", caption);
-
-    float max_width = 0.f;
-    GUI<float>::GetSetting(this, "maxwidth", max_width);
-
-    *m_GeneratedTexts[0] = GetGUI()->GenerateText(caption, font, max_width, buffer_zone, this);
-
-
     // Position the tooltip relative to the mouse:
 
-    CPos mousepos, offset;
-    EVAlign anchor;
-    GUI<CPos>::GetSetting(this, "_mousepos", mousepos);
-    GUI<CPos>::GetSetting(this, "offset", offset);
-    GUI<EVAlign>::GetSetting(this, "anchor", anchor);
-
     // TODO: Calculate the actual width of the wrapped text and use that.
     // (m_Size.cx is >max_width if the text wraps, which is not helpful)
-    float textwidth = std::min(m_GeneratedTexts[0]->m_Size.cx, (float)max_width);
+    float textwidth = std::min(m_GeneratedTexts[0]->m_Size.cx, m_MaxWidth);
     float textheight = m_GeneratedTexts[0]->m_Size.cy;
 
     CClientArea size;
-    size.pixel.left = mousepos.x + offset.x;
+    size.pixel.left = m_MousePos.x + m_Offset.x;
     size.pixel.right = size.pixel.left + textwidth;
-    switch (anchor)
+    switch (m_Anchor)
     {
     case EVAlign_Top:
-        size.pixel.top = mousepos.y + offset.y;
+        size.pixel.top = m_MousePos.y + m_Offset.y;
         size.pixel.bottom = size.pixel.top + textheight;
         break;
     case EVAlign_Bottom:
-        size.pixel.bottom = mousepos.y + offset.y;
+        size.pixel.bottom = m_MousePos.y + m_Offset.y;
         size.pixel.top = size.pixel.bottom - textheight;
         break;
     case EVAlign_Center:
-        size.pixel.top = mousepos.y + offset.y - textheight/2.f;
+        size.pixel.top = m_MousePos.y + m_Offset.y - textheight/2.f;
         size.pixel.bottom = size.pixel.top + textwidth;
         break;
     default:
@@ -129 +111 @@
         size.pixel.right -= size.pixel.left, size.pixel.left = 0.f;
     else if (size.pixel.right > screenw)
         size.pixel.left -= (size.pixel.right-screenw), size.pixel.right = screenw;
-    
-    GUI<CClientArea>::SetSetting(this, "size", size);
+
+//  GUI<CClientArea>::SetSetting(this, "size", size);
+    SetSize(size);
 }
 
 void CTooltip::HandleMessage(SGUIMessage &Message)
@@ -138 +121 @@
     IGUITextOwner::HandleMessage(Message);
 }
 
-void CTooltip::Draw() 
+void CTooltip::Draw()
 {
-    float z = 900.f; // TODO: Find a nicer way of putting the tooltip on top of everything else
-
     if (GetGUI())
     {
-        CGUISpriteInstance *sprite;
-        GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite", sprite);
+        float z = 900.f; // TODO: Find a nicer way of putting the tooltip on top of everything else
 
         // Normally IGUITextOwner will handle this updating but since SetupText can modify the position
         // we need to call it now *before* we do the rest of the drawing
@@ -155 +135 @@
             m_GeneratedTextsValid = true;
         }
 
-        GetGUI()->DrawSprite(*sprite, 0, z, m_CachedActualSize);
+        GetGUI()->DrawSprite(m_Sprite, 0, z, m_CachedActualSize);
 
-        CColor color;
-        GUI<CColor>::GetSetting(this, "textcolor", color);
-
         // Draw text
-        IGUITextOwner::Draw(0, color, m_CachedActualSize.TopLeft(), z+0.1f);
+        IGUITextOwner::Draw(0, m_TextColor, m_CachedActualSize.TopLeft(), z+0.1f);
     }
 }