summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorpixel <pixel>2003-07-12 03:12:36 +0000
committerpixel <pixel>2003-07-12 03:12:36 +0000
commitd265a7fde35d0b5040f79d490d137deaff57f0b7 (patch)
tree454854b79e27f91199cc1319a562388aa4e640ba /include
parente0f0cfd81fbec4fc20a591409f1bef67e16d62e7 (diff)
Fixed some win32 things
Diffstat (limited to 'include')
-rw-r--r--include/font.h4
-rw-r--r--include/gettext.h10
2 files changed, 2 insertions, 12 deletions
diff --git a/include/font.h b/include/font.h
index 3a1d1c7..a557f6e 100644
--- a/include/font.h
+++ b/include/font.h
@@ -16,7 +16,7 @@ namespace mogltk {
virtual void drawentry(Uint16, int, int, ColorP = WHITE);
void putcursor(int, int);
void putentry(Uint16, ColorP = WHITE);
- void putchar(char, ColorP = WHITE);
+ void drawchar(char, ColorP = WHITE);
void newline(void);
int printf(const ugly_string &, ...);
int printf(const char *, ...);
@@ -24,7 +24,7 @@ namespace mogltk {
void setcolor(ColorP);
void setshadow(int);
void setwspace(int);
- int getchar(char) const;
+ int findchar(char) const;
int singletextsize(const String &) const;
protected:
diff --git a/include/gettext.h b/include/gettext.h
index 662a424..b530d9c 100644
--- a/include/gettext.h
+++ b/include/gettext.h
@@ -27,16 +27,6 @@
#else
-/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
- chokes if dcgettext is defined as a macro. So include it now, to make
- later inclusions of <locale.h> a NOP. We don't include <libintl.h>
- as well because people using "gettext.h" will not include <libintl.h>,
- and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
- is OK. */
-#if defined(__sun)
-# include <locale.h>
-#endif
-
/* Disabled NLS.
The casts to 'const char *' serve the purpose of producing warnings
for invalid uses of the value returned from these functions.