diff options
| author | Adam Tkac <atkac@redhat.com> | 2009-09-04 10:57:20 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2009-09-04 10:57:20 +0000 |
| commit | d36b626bbb7b90306d3d93a5b82fd117fe8ec15f (patch) | |
| tree | a535fbe60d92182b93c8a5f3a1f4e5d811c3a8a8 /unix/tx | |
| parent | 97abe8a548ff9ca940d568128b21813b8a253872 (diff) | |
| download | tigervnc-d36b626bbb7b90306d3d93a5b82fd117fe8ec15f.tar.gz tigervnc-d36b626bbb7b90306d3d93a5b82fd117fe8ec15f.zip | |
Revert previous commit (r3889). Windows code has to be cleaned before this
change.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3890 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'unix/tx')
| -rw-r--r-- | unix/tx/TXButton.h | 2 | ||||
| -rw-r--r-- | unix/tx/TXLabel.h | 2 | ||||
| -rw-r--r-- | unix/tx/TXMenu.cxx | 2 | ||||
| -rw-r--r-- | unix/tx/TXWindow.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/unix/tx/TXButton.h b/unix/tx/TXButton.h index 59a84303..b7472797 100644 --- a/unix/tx/TXButton.h +++ b/unix/tx/TXButton.h @@ -59,7 +59,7 @@ public: // setText() changes the text in the button. void setText(const char* text_) { - text.buf = safe_strdup(text_); + text.buf = rfb::strDup(text_); int textWidth = XTextWidth(defaultFS, text.buf, strlen(text.buf)); int textHeight = (defaultFS->ascent + defaultFS->descent); int newWidth = __rfbmax(width(), textWidth + xPad*2 + bevel*2); diff --git a/unix/tx/TXLabel.h b/unix/tx/TXLabel.h index ebb8403c..3d5200d6 100644 --- a/unix/tx/TXLabel.h +++ b/unix/tx/TXLabel.h @@ -47,7 +47,7 @@ public: // setText() changes the text in the label. void setText(const char* text_) { - text.buf = safe_strdup(text_); + text.buf = rfb::strDup(text_); lines = 0; int lineStart = 0; int textWidth = 0; diff --git a/unix/tx/TXMenu.cxx b/unix/tx/TXMenu.cxx index df57daf8..92712f55 100644 --- a/unix/tx/TXMenu.cxx +++ b/unix/tx/TXMenu.cxx @@ -56,7 +56,7 @@ inline int TXMenu::entryHeight(int i) void TXMenu::addEntry(const char* text_, long id_) { assert(nEntries < maxEntries); - text[nEntries] = safe_strdup(text_); + text[nEntries] = rfb::strDup(text_); checked[nEntries] = false; id[nEntries++] = id_; int tw = 0; diff --git a/unix/tx/TXWindow.cxx b/unix/tx/TXWindow.cxx index 1b695e5b..2b535df8 100644 --- a/unix/tx/TXWindow.cxx +++ b/unix/tx/TXWindow.cxx @@ -93,7 +93,7 @@ void TXWindow::init(Display* dpy, const char* defaultWindowClass_) static char tickBits[] = { 0x80, 0xc0, 0xe2, 0x76, 0x3e, 0x1c, 0x08, 0x00}; tick = XCreateBitmapFromData(dpy, DefaultRootWindow(dpy), tickBits, tickSize, tickSize); - defaultWindowClass = safe_strdup(defaultWindowClass_); + defaultWindowClass = rfb::strDup(defaultWindowClass_); } void TXWindow::handleXEvents(Display* dpy) |