aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/XFontImp.cc
diff options
context:
space:
mode:
authorrathnor <rathnor>2004-06-07 11:46:05 (GMT)
committerrathnor <rathnor>2004-06-07 11:46:05 (GMT)
commitfff4456dee29e675d7f2ed3490db39bcb7e10e53 (patch)
tree2d2dbf386551773cbdc8231b2a93b493187bd733 /src/FbTk/XFontImp.cc
parent073065ac56b388db1169108d44f37d32f1d19c67 (diff)
downloadfluxbox_pavel-fff4456dee29e675d7f2ed3490db39bcb7e10e53.zip
fluxbox_pavel-fff4456dee29e675d7f2ed3490db39bcb7e10e53.tar.bz2
update NLS string handling...
Diffstat (limited to 'src/FbTk/XFontImp.cc')
-rw-r--r--src/FbTk/XFontImp.cc11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/FbTk/XFontImp.cc b/src/FbTk/XFontImp.cc
index e253aa6..0a1ea7d 100644
--- a/src/FbTk/XFontImp.cc
+++ b/src/FbTk/XFontImp.cc
@@ -19,12 +19,13 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: XFontImp.cc,v 1.6 2003/09/11 20:00:09 fluxgen Exp $ 22// $Id: XFontImp.cc,v 1.7 2004/06/07 11:46:05 rathnor Exp $
23 23
24#include "XFontImp.hh" 24#include "XFontImp.hh"
25#include "App.hh" 25#include "App.hh"
26#include "GContext.hh" 26#include "GContext.hh"
27#include "FbPixmap.hh" 27#include "FbPixmap.hh"
28#include "I18n.hh"
28 29
29#include <X11/Xutil.h> 30#include <X11/Xutil.h>
30 31
@@ -121,6 +122,8 @@ void XFontImp::rotate(float angle) {
121 return; 122 return;
122 } 123 }
123 124
125 _FB_USES_NLS;
126
124 //get positive angle 127 //get positive angle
125 while (angle < 0) 128 while (angle < 0)
126 angle += 360; 129 angle += 360;
@@ -157,7 +160,7 @@ void XFontImp::rotate(float angle) {
157 m_rotfont = new(nothrow) XRotFontStruct; 160 m_rotfont = new(nothrow) XRotFontStruct;
158 161
159 if (m_rotfont == 0) { 162 if (m_rotfont == 0) {
160 cerr<<"RotFont: out of memory"<<endl; 163 cerr<<"RotFont: "<<_FBTKTEXT(Error, OutOfMemory, "Out of memory", "Something couldn't allocate memory")<<endl;
161 return; 164 return;
162 } 165 }
163 166
@@ -224,7 +227,7 @@ void XFontImp::rotate(float angle) {
224 vert_w, vert_h, 8, 0); 227 vert_w, vert_h, 8, 0);
225 228
226 if (I1 == None) { 229 if (I1 == None) {
227 cerr<<"RotFont: Cant create ximage."<<endl; 230 cerr<<"RotFont: "<<_FBTKTEXT(Error, CreateXImage, "Cant create XImage", "XCreateImage failed for some reason")<<"."<<endl;
228 delete m_rotfont; 231 delete m_rotfont;
229 m_rotfont = 0; 232 m_rotfont = 0;
230 return; 233 return;
@@ -262,7 +265,7 @@ void XFontImp::rotate(float angle) {
262 (char *)bitdata, bit_w, bit_h, 8, 0); 265 (char *)bitdata, bit_w, bit_h, 8, 0);
263 266
264 if (I2 == None) { 267 if (I2 == None) {
265 cerr<<"XFontImp: Cant create ximage!"<<endl; 268 cerr<<"XFontImp: "<<_FBTKTEXT(Error, CreateXImage, "Cant create XImage", "XCreateImage failed for some reason")<<"."<<endl;
266 delete m_rotfont; 269 delete m_rotfont;
267 m_rotfont = 0; 270 m_rotfont = 0;
268 return; 271 return;