[paragui-cvs] CVS: paragui/src/widgets pglineedit.cpp,1.3,1.3.6.1 pgmenubar.cpp,1.1.1.1,1.1.1.1.6.1 pgnotebook.cpp,1.3,1.3.6.1 pgpopupmenu.cpp,1.3.6.3,1.3.6.4 pgrichedit.cpp,1.3.6.4,1.3.6.5 pgthemewidget.cpp,1.3.6.5,1.3.6.6 pgwidget.cpp,1.4.4.11,1.4.4.12 pgwidgetlist.cpp,1.3.6.1,1.3.6.2 pgwidgetlistex.cpp,1.3,1.3.6.1

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui/src/widgets
In directory subversions:/tmp/cvs-serv24897/src/widgets

Modified Files:
      Tag: devel-1-0
        pglineedit.cpp pgmenubar.cpp pgnotebook.cpp pgpopupmenu.cpp 
        pgrichedit.cpp pgthemewidget.cpp pgwidget.cpp pgwidgetlist.cpp 
        pgwidgetlistex.cpp 
Log Message:
- kicked version to 1.0.4
- added "using namespace std;" to paraconfig.h
- removed all std:: prefixes
- removed std:: hacks for gcc, mwerks compilers (no longer needed due to 
default namespace std)



Index: pglineedit.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pglineedit.cpp,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -r1.3 -r1.3.6.1
*** pglineedit.cpp      15 Apr 2002 13:35:36 -0000      1.3
--- pglineedit.cpp      4 Jan 2003 21:13:41 -0000       1.3.6.1
***************
*** 154,158 ****
  
  const char* PG_LineEdit::GetDrawText() {
!       static std::string      passtext;
  
        if (my_passchar == 0)
--- 154,158 ----
  
  const char* PG_LineEdit::GetDrawText() {
!       static string passtext;
  
        if (my_passchar == 0)
***************
*** 537,541 ****
        }
  
!       return (my_validkeys.find(c) != std::string::npos);
  }
  
--- 537,541 ----
        }
  
!       return (my_validkeys.find(c) != string::npos);
  }
  

Index: pgmenubar.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgmenubar.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.6.1
diff -C2 -r1.1.1.1 -r1.1.1.1.6.1
*** pgmenubar.cpp       15 Apr 2002 13:22:15 -0000      1.1.1.1
--- pgmenubar.cpp       4 Jan 2003 21:13:41 -0000       1.1.1.1.6.1
***************
*** 78,82 ****
  
  void PG_MenuBar::Cleanup() {
!       for(std::vector<MenuBarItem*>::iterator i = ItemList.begin(); i != 
ItemList.end(); i = ItemList.begin()) {
                delete (*i)->button;
                delete (*i);
--- 78,82 ----
  
  void PG_MenuBar::Cleanup() {
!       for(vector<MenuBarItem*>::iterator i = ItemList.begin(); i != 
ItemList.end(); i = ItemList.begin()) {
                delete (*i)->button;
                delete (*i);

Index: pgnotebook.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgnotebook.cpp,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -r1.3 -r1.3.6.1
*** pgnotebook.cpp      15 Apr 2002 13:35:36 -0000      1.3
--- pgnotebook.cpp      4 Jan 2003 21:13:41 -0000       1.3.6.1
***************
*** 288,293 ****
                  return;
  
!         std::vector<PG_NotebookPage*>::iterator pit = my_tab_pages.begin();
!         std::vector<PG_NotebookPage*>::iterator pend = my_tab_pages.end();
  
          while(pit != pend) {
--- 288,293 ----
                  return;
  
!         vector<PG_NotebookPage*>::iterator pit = my_tab_pages.begin();
!         vector<PG_NotebookPage*>::iterator pend = my_tab_pages.end();
  
          while(pit != pend) {
***************
*** 300,305 ****
          }
  
!         std::vector<PG_Widget*>::iterator lit = my_widgetList.begin();
!         std::vector<PG_Widget*>::iterator lend = my_widgetList.end();
  
          while (lit != lend) {
--- 300,305 ----
          }
  
!         vector<PG_Widget*>::iterator lit = my_widgetList.begin();
!         vector<PG_Widget*>::iterator lend = my_widgetList.end();
  
          while (lit != lend) {
***************
*** 452,457 ****
          if (recalc_pages) {
                  // Calculate the width of all the pages' titles
!                 std::vector<PG_NotebookPage*>::iterator it = my_pages.begin();
!                 std::vector<PG_NotebookPage*>::iterator end = my_pages.end();
  
                  Uint16 w, tw = 0;
--- 452,457 ----
          if (recalc_pages) {
                  // Calculate the width of all the pages' titles
!                 vector<PG_NotebookPage*>::iterator it = my_pages.begin();
!                 vector<PG_NotebookPage*>::iterator end = my_pages.end();
  
                  Uint16 w, tw = 0;
***************
*** 488,493 ****
  void PG_Notebook::HandleButtonClick(PG_NotebookButtons btn)
  {
!         std::vector<PG_NotebookPage*>::iterator it = my_pages.begin();
!         std::vector<PG_NotebookPage*>::iterator end = my_pages.end();
  
          Uint32 not_ok = 0;
--- 488,493 ----
  void PG_Notebook::HandleButtonClick(PG_NotebookButtons btn)
  {
!         vector<PG_NotebookPage*>::iterator it = my_pages.begin();
!         vector<PG_NotebookPage*>::iterator end = my_pages.end();
  
          Uint32 not_ok = 0;

Index: pgpopupmenu.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgpopupmenu.cpp,v
retrieving revision 1.3.6.3
retrieving revision 1.3.6.4
diff -C2 -r1.3.6.3 -r1.3.6.4
*** pgpopupmenu.cpp     3 Jul 2002 14:01:43 -0000       1.3.6.3
--- pgpopupmenu.cpp     4 Jan 2003 21:13:41 -0000       1.3.6.4
***************
*** 330,334 ****
        MII mi;
  
!       mi = std::find_if(start, stop, item_with_id(id));
        if (*mi && mi != stop)
                ((MenuItem*)*mi)->disable();
--- 330,334 ----
        MII mi;
  
!       mi = find_if(start, stop, item_with_id(id));
        if (*mi && mi != stop)
                ((MenuItem*)*mi)->disable();
***************
*** 338,342 ****
        MII mi;
  
!       mi = std::find_if(start, stop, item_with_id(id));
        if (*mi && mi != stop)
                ((MenuItem*)*mi)->enable();
--- 338,342 ----
        MII mi;
  
!       mi = find_if(start, stop, item_with_id(id));
        if (*mi && mi != stop)
                ((MenuItem*)*mi)->enable();

Index: pgrichedit.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgrichedit.cpp,v
retrieving revision 1.3.6.4
retrieving revision 1.3.6.5
diff -C2 -r1.3.6.4 -r1.3.6.5
*** pgrichedit.cpp      22 Nov 2002 17:58:43 -0000      1.3.6.4
--- pgrichedit.cpp      4 Jan 2003 21:13:41 -0000       1.3.6.5
***************
*** 100,104 ****
  }
  
! void PG_RichEdit::SetText(const std::string &text) {
        SetText(text.c_str());
  }
--- 100,104 ----
  }
  
! void PG_RichEdit::SetText(const string &text) {
        SetText(text.c_str());
  }
***************
*** 142,146 ****
                int bl, ls;
                bool space = false;
!               std::string word;
  
                searchFrom = GetWord(searchFrom, &word, &wordDescr.my_EndMark);
--- 142,146 ----
                int bl, ls;
                bool space = false;
!               string word;
  
                searchFrom = GetWord(searchFrom, &word, &wordDescr.my_EndMark);
***************
*** 168,172 ****
                my_ParsedWords.push_back(wordDescr);
  
!               if ((searchFrom != std::string::npos) && (searchFrom < 
my_text.length()))
                        searchFrom++;
                else
--- 168,172 ----
                my_ParsedWords.push_back(wordDescr);
  
!               if ((searchFrom != string::npos) && (searchFrom < 
my_text.length()))
                        searchFrom++;
                else
***************
*** 175,185 ****
  }
  
! size_t PG_RichEdit::GetWord(size_t searchFrom, std::string *word, Uint32 
*endMark) {
!       size_t ik, length = my_text.length(), result = std::string::npos;
  
        *endMark = my_Marks[MARK_SPACE];
  
        if (searchFrom >= my_text.length()) {
!               return std::string::npos;
        }
  
--- 175,185 ----
  }
  
! size_t PG_RichEdit::GetWord(size_t searchFrom, string *word, Uint32 *endMark) 
{
!       size_t ik, length = my_text.length(), result = string::npos;
  
        *endMark = my_Marks[MARK_SPACE];
  
        if (searchFrom >= my_text.length()) {
!               return string::npos;
        }
  
***************
*** 195,199 ****
        }
  
!       if (result != std::string::npos) {
                size_t increment = 1;
  
--- 195,199 ----
        }
  
!       if (result != string::npos) {
                size_t increment = 1;
  
***************
*** 203,207 ****
                
                if ((Uint32)my_text[result] == 
my_Marks[MARK_NONBREAKABLE_SPACE]) {
!                       std::string newword;
  
                        *word += " ";
--- 203,207 ----
                
                if ((Uint32)my_text[result] == 
my_Marks[MARK_NONBREAKABLE_SPACE]) {
!                       string newword;
  
                        *word += " ";
***************
*** 496,500 ****
  
  void PG_RichEdit::GetWidgetsOnLine(Sint32 lineTop, Uint32 lineHeight, 
WidgetMap &widgetsOnLine, bool clear) {
!       std::vector<PG_Widget*>::iterator child;
  
        if (clear)
--- 496,500 ----
  
  void PG_RichEdit::GetWidgetsOnLine(Sint32 lineTop, Uint32 lineHeight, 
WidgetMap &widgetsOnLine, bool clear) {
!       vector<PG_Widget*>::iterator child;
  
        if (clear)
***************
*** 524,528 ****
  }
  
! bool PG_RichEdit::ProcessLongLine(std::string &word, size_t &searchFrom, 
Uint32 oldFind, Sint32 lineTop, Uint32 &lineSpace, bool normalLine, 
RichLineArray::iterator actualLine, RichLinePartArray::iterator actualLinePart, 
Uint32 &lineAscent) {
        /*Sint32          w = 0, h = 0, ls = 0, la = 0;
        PG_FontParam    newFont; 
--- 524,528 ----
  }
  
! bool PG_RichEdit::ProcessLongLine(string &word, size_t &searchFrom, Uint32 
oldFind, Sint32 lineTop, Uint32 &lineSpace, bool normalLine, 
RichLineArray::iterator actualLine, RichLinePartArray::iterator actualLinePart, 
Uint32 &lineAscent) {
        /*Sint32          w = 0, h = 0, ls = 0, la = 0;
        PG_FontParam    newFont; 
***************
*** 538,542 ****
            }
            
!           std::string newword = word.substr(0, ((ik == std::string::npos) ? 
ik : ik + 1));           
            PG_FontEngine::GetTextSize(newword.c_str(), GetFont(), &w, &h, &la, 
&ls, NULL, NULL, NULL);
  
--- 538,542 ----
            }
            
!           string newword = word.substr(0, ((ik == string::npos) ? ik : ik + 
1));           
            PG_FontEngine::GetTextSize(newword.c_str(), GetFont(), &w, &h, &la, 
&ls, NULL, NULL, NULL);
  

Index: pgthemewidget.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgthemewidget.cpp,v
retrieving revision 1.3.6.5
retrieving revision 1.3.6.6
diff -C2 -r1.3.6.5 -r1.3.6.6
*** pgthemewidget.cpp   25 Jul 2002 07:27:38 -0000      1.3.6.5
--- pgthemewidget.cpp   4 Jan 2003 21:13:41 -0000       1.3.6.6
***************
*** 451,455 ****
        SDL_Surface* cache_surface = NULL;
        SDL_Surface* screen = PG_Application::GetScreen();
!       std::string key;
  
        if(r.w == 0 || r.h == 0) {
--- 451,455 ----
        SDL_Surface* cache_surface = NULL;
        SDL_Surface* screen = PG_Application::GetScreen();
!       string key;
  
        if(r.w == 0 || r.h == 0) {

Index: pgwidget.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgwidget.cpp,v
retrieving revision 1.4.4.11
retrieving revision 1.4.4.12
diff -C2 -r1.4.4.11 -r1.4.4.12
*** pgwidget.cpp        1 Nov 2002 15:00:59 -0000       1.4.4.11
--- pgwidget.cpp        4 Jan 2003 21:13:41 -0000       1.4.4.12
***************
*** 41,45 ****
  
  typedef STL_MAP<int, PG_Widget*> PG_IdToWidgetMap;
! typedef std::map<std::string, PG_Widget*> PG_NameToWidgetMap;
  
  struct PG_WidgetDataInternal{
--- 41,45 ----
  
  typedef STL_MAP<int, PG_Widget*> PG_IdToWidgetMap;
! typedef map<string, PG_Widget*> PG_NameToWidgetMap;
  
  struct PG_WidgetDataInternal{
***************
*** 75,79 ****
  
        bool inDestruct;
!       std::string name;
        
        bool hidden;
--- 75,79 ----
  
        bool inDestruct;
!       string name;
        
        bool hidden;
***************
*** 362,366 ****
        }
        else {
!                       std::string n = name;
                        my_internaldata->childrenNameMap[n] = child;
        }
--- 362,366 ----
        }
        else {
!                       string n = name;
                        my_internaldata->childrenNameMap[n] = child;
        }
***************
*** 1294,1298 ****
        }
  
!       my_text = std::string(text);
        Update();
  }
--- 1294,1298 ----
        }
  
!       my_text = string(text);
        Update();
  }
***************
*** 1789,1793 ****
  
  PG_Widget* PG_Widget::FindChild(const char *name) {
!       std::string n = name;
        PG_NameToWidgetMap::iterator r = 
my_internaldata->childrenNameMap.find(n);
  
--- 1789,1793 ----
  
  PG_Widget* PG_Widget::FindChild(const char *name) {
!       string n = name;
        PG_NameToWidgetMap::iterator r = 
my_internaldata->childrenNameMap.find(n);
  

Index: pgwidgetlist.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgwidgetlist.cpp,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -C2 -r1.3.6.1 -r1.3.6.2
*** pgwidgetlist.cpp    20 Jun 2002 14:35:33 -0000      1.3.6.1
--- pgwidgetlist.cpp    4 Jan 2003 21:13:41 -0000       1.3.6.2
***************
*** 231,235 ****
        }
        
!       std::vector<PG_Widget*>::iterator list = my_widgetList.begin();
        PG_Widget* w = NULL;
  
--- 231,235 ----
        }
        
!       vector<PG_Widget*>::iterator list = my_widgetList.begin();
        PG_Widget* w = NULL;
  
***************
*** 337,342 ****
  
  bool PG_WidgetList::RemoveWidget(PG_Widget* w, bool shiftx, bool shifty) {
!       std::vector<PG_Widget*>::iterator wi = my_widgetList.begin();
!       std::vector<PG_Widget*>::iterator ri = my_widgetList.end();
  
        PG_Widget* widget = NULL;
--- 337,342 ----
  
  bool PG_WidgetList::RemoveWidget(PG_Widget* w, bool shiftx, bool shifty) {
!       vector<PG_Widget*>::iterator wi = my_widgetList.begin();
!       vector<PG_Widget*>::iterator ri = my_widgetList.end();
  
        PG_Widget* widget = NULL;
***************
*** 371,375 ****
  
                        my_listwidth = 0;
!                       std::vector<PG_Widget*>::iterator header;
  
                        for (header = my_widgetList.begin(); header < 
my_widgetList.end(); header++) {
--- 371,375 ----
  
                        my_listwidth = 0;
!                       vector<PG_Widget*>::iterator header;
  
                        for (header = my_widgetList.begin(); header < 
my_widgetList.end(); header++) {

Index: pgwidgetlistex.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/widgets/pgwidgetlistex.cpp,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -r1.3 -r1.3.6.1
*** pgwidgetlistex.cpp  15 Apr 2002 13:35:36 -0000      1.3
--- pgwidgetlistex.cpp  4 Jan 2003 21:13:41 -0000       1.3.6.1
***************
*** 66,70 ****
  
  bool PG_WidgetListEx::RemoveWidget(PG_Widget* w, bool shiftx, bool shifty) {
!       std::vector<PG_Widget*>::iterator wi = my_widgetList.begin();
        PG_Widget* widget = NULL;
  
--- 66,70 ----
  
  bool PG_WidgetListEx::RemoveWidget(PG_Widget* w, bool shiftx, bool shifty) {
!       vector<PG_Widget*>::iterator wi = my_widgetList.begin();
        PG_Widget* widget = NULL;
  
***************
*** 82,86 ****
                                my_listheight = 0;
  
!                       for (std::vector<PG_Widget*>::iterator header = 
my_widgetList.begin(); header < my_widgetList.end(); header++) {
  
                                PG_Point pos = ScreenToClient((*header)->
--- 82,86 ----
                                my_listheight = 0;
  
!                       for (vector<PG_Widget*>::iterator header = 
my_widgetList.begin(); header < my_widgetList.end(); header++) {
  
                                PG_Point pos = ScreenToClient((*header)->