|
Line
Link Here
|
| 0 |
-- glademm-2.6.0.orig/src/writers/optionmenu.cc |
0 |
++ glademm-2.6.0/src/writers/optionmenu.cc |
|
Lines 21-26
Link Here
|
| 21 |
#include "button.hh" |
21 |
#include "button.hh" |
| 22 |
#include "../strsep.h" |
22 |
#include "../strsep.h" |
| 23 |
|
23 |
|
|
|
24 |
#include <cstring> |
| 25 |
|
| 24 |
class Gtk_OptionMenu : public Gtk_Button |
26 |
class Gtk_OptionMenu : public Gtk_Button |
| 25 |
{ static const char * const MenuTags; |
27 |
{ static const char * const MenuTags; |
| 26 |
static Tag menu; |
28 |
static Tag menu; |
| 27 |
-- glademm-2.6.0.orig/src/writers/ctree.cc |
29 |
++ glademm-2.6.0/src/writers/ctree.cc |
|
Lines 21-26
Link Here
|
| 21 |
|
21 |
|
| 22 |
#include "container.hh" |
22 |
#include "container.hh" |
| 23 |
|
23 |
|
|
|
24 |
#include <cstring> |
| 25 |
|
| 24 |
class Gtk_CTree : public Gtk_Container |
26 |
class Gtk_CTree : public Gtk_Container |
| 25 |
{public: |
27 |
{public: |
| 26 |
typedef Gtk_Container Parent; |
28 |
typedef Gtk_Container Parent; |
| 27 |
-- glademm-2.6.0.orig/src/writers/xpmname.cc |
29 |
++ glademm-2.6.0/src/writers/xpmname.cc |
|
Lines 2-7
Link Here
|
| 2 |
#include <string> |
2 |
#include <string> |
| 3 |
#include <Configuration.hh> |
3 |
#include <Configuration.hh> |
| 4 |
|
4 |
|
|
|
5 |
#include <cstring> |
| 6 |
|
| 5 |
// parts taken from |
7 |
// parts taken from |
| 6 |
/* xpmtoppm.c - read an X11 pixmap file and produce a portable pixmap |
8 |
/* xpmtoppm.c - read an X11 pixmap file and produce a portable pixmap |
| 7 |
** |
9 |
** |
| 8 |
-- glademm-2.6.0.orig/src/writers/gnome_about.cc |
10 |
++ glademm-2.6.0/src/writers/gnome_about.cc |
|
Lines 21-26
Link Here
|
| 21 |
#include "gnome_dialog.hh" |
21 |
#include "gnome_dialog.hh" |
| 22 |
#include "../strsep.h" |
22 |
#include "../strsep.h" |
| 23 |
|
23 |
|
|
|
24 |
#include <cstring> |
| 25 |
|
| 24 |
class Gnome_About : public Gnome_Dialog |
26 |
class Gnome_About : public Gnome_Dialog |
| 25 |
{public: |
27 |
{public: |
| 26 |
typedef Gnome_Dialog Parent; |
28 |
typedef Gnome_Dialog Parent; |
| 27 |
-- glademm-2.6.0.orig/src/writers/bonobo_dock.cc |
29 |
++ glademm-2.6.0/src/writers/bonobo_dock.cc |
|
Lines 20-25
Link Here
|
| 20 |
|
20 |
|
| 21 |
#include "container.hh" |
21 |
#include "container.hh" |
| 22 |
|
22 |
|
|
|
23 |
#include <cstring> |
| 24 |
|
| 23 |
class Bonobo_Dock : public Gtk_Container |
25 |
class Bonobo_Dock : public Gtk_Container |
| 24 |
{public: |
26 |
{public: |
| 25 |
typedef Gtk_Container Parent; |
27 |
typedef Gtk_Container Parent; |
| 26 |
-- glademm-2.6.0.orig/src/writers/bonobo_dockitem.cc |
28 |
++ glademm-2.6.0/src/writers/bonobo_dockitem.cc |
|
Lines 20-25
Link Here
|
| 20 |
|
20 |
|
| 21 |
#include "bin.hh" |
21 |
#include "bin.hh" |
| 22 |
|
22 |
|
|
|
23 |
#include <cstring> |
| 24 |
|
| 23 |
class Bonobo_DockItem : public Gtk_Bin |
25 |
class Bonobo_DockItem : public Gtk_Bin |
| 24 |
{public: |
26 |
{public: |
| 25 |
typedef Gtk_Bin Parent; |
27 |
typedef Gtk_Bin Parent; |
| 26 |
-- glademm-2.6.0.orig/src/writers/clist.cc |
28 |
++ glademm-2.6.0/src/writers/clist.cc |
|
Lines 21-26
Link Here
|
| 21 |
#include "clist.hh" |
21 |
#include "clist.hh" |
| 22 |
#include "../strsep.h" |
22 |
#include "../strsep.h" |
| 23 |
|
23 |
|
|
|
24 |
#include <cstring> |
| 25 |
|
| 24 |
static Gtk_CList Gtk_CList(false); |
26 |
static Gtk_CList Gtk_CList(false); |
| 25 |
|
27 |
|
| 26 |
const std::string Gtk_CList::TypeName(const Widget &w) const |
28 |
const std::string Gtk_CList::TypeName(const Widget &w) const |
| 27 |
-- glademm-2.6.0.orig/src/writers/combo.cc |
29 |
++ glademm-2.6.0/src/writers/combo.cc |
|
Lines 21-26
Link Here
|
| 21 |
#include "combo.hh" |
21 |
#include "combo.hh" |
| 22 |
#include "../strsep.h" |
22 |
#include "../strsep.h" |
| 23 |
|
23 |
|
|
|
24 |
#include <cstring> |
| 25 |
|
| 24 |
static Gtk_Combo Gtk_Combo(false); |
26 |
static Gtk_Combo Gtk_Combo(false); |
| 25 |
|
27 |
|
| 26 |
const std::string Gtk_Combo::TypeName(const Widget &w) const |
28 |
const std::string Gtk_Combo::TypeName(const Widget &w) const |
| 27 |
-- glademm-2.6.0.orig/src/TagStream.hh |
29 |
++ glademm-2.6.0/src/TagStream.hh |
|
Lines 26-31
Link Here
|
| 26 |
#include <fstream> |
26 |
#include <fstream> |
| 27 |
#include <strstream> |
27 |
#include <strstream> |
| 28 |
|
28 |
|
|
|
29 |
#include <cstring> |
| 30 |
|
| 29 |
class TagStream : public Tag |
31 |
class TagStream : public Tag |
| 30 |
{ // ---- for reading ----- |
32 |
{ // ---- for reading ----- |
| 31 |
// copied from _GbWidgetLoadData |
33 |
// copied from _GbWidgetLoadData |
| 32 |
-- glademm-2.6.0.orig/src/Tag.cc |
34 |
++ glademm-2.6.0/src/Tag.cc |
|
Lines 23-28
Link Here
|
| 23 |
#include <locale.h> |
23 |
#include <locale.h> |
| 24 |
#include <iostream> |
24 |
#include <iostream> |
| 25 |
|
25 |
|
|
|
26 |
#include <cstring> |
| 27 |
|
| 26 |
const Tag *Tag::find(const std::string &tp) const |
28 |
const Tag *Tag::find(const std::string &tp) const |
| 27 |
{ const_iterator i=find(begin(),tp); |
29 |
{ const_iterator i=find(begin(),tp); |
| 28 |
if (i==end()) return 0; |
30 |
if (i==end()) return 0; |
| 29 |
-- glademm-2.6.0.orig/src/TagStream.cc |
31 |
++ glademm-2.6.0/src/TagStream.cc |
|
Lines 20-26
Link Here
|
| 20 |
#include "TagStream.hh" |
20 |
#include "TagStream.hh" |
| 21 |
#include <cstring> |
21 |
#include <cstring> |
| 22 |
#include <unistd.h> |
22 |
#include <unistd.h> |
| 23 |
#include <algo.h> |
23 |
#include <algorithm> |
|
|
24 |
#include <iostream> |
| 24 |
|
25 |
|
| 25 |
//#define REMEMBER_EMPTY_SPACE |
26 |
//#define REMEMBER_EMPTY_SPACE |
| 26 |
|
27 |
|
|
Lines 73-82
Link Here
|
| 73 |
{ std::string ret; |
74 |
{ std::string ret; |
| 74 |
std::string::const_iterator i(cont.begin()); |
75 |
std::string::const_iterator i(cont.begin()); |
| 75 |
while (i!=cont.end()) |
76 |
while (i!=cont.end()) |
| 76 |
{ std::string::const_iterator verbatim(::find(i,cont.end(),'&')); |
77 |
{ std::string::const_iterator verbatim(std::find(i,cont.end(),'&')); |
| 77 |
ret+=std::string(i,verbatim); |
78 |
ret+=std::string(i,verbatim); |
| 78 |
if (verbatim!=cont.end()) |
79 |
if (verbatim!=cont.end()) |
| 79 |
{ std::string::const_iterator endtag(::find(verbatim,cont.end(),';')); |
80 |
{ std::string::const_iterator endtag(std::find(verbatim,cont.end(),';')); |
| 80 |
if (endtag!=cont.end()) ++endtag; |
81 |
if (endtag!=cont.end()) ++endtag; |
| 81 |
std::string tag(verbatim,endtag); |
82 |
std::string tag(verbatim,endtag); |
| 82 |
if (tag[1]=='#' && tag[2]=='x') |
83 |
if (tag[1]=='#' && tag[2]=='x') |
