aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornyamatongwe <unknown>2010-08-19 09:47:44 +1000
committernyamatongwe <unknown>2010-08-19 09:47:44 +1000
commit3dfcb85a1e2def2c14cb0073b16ebc246bd75188 (patch)
tree1679ffa1836b630dfc8c28efae5b42553cbdbc44
parentd2c85cbd8c413d61f7b929c0a7f112f954b39b1f (diff)
downloadscintilla-mirror-3dfcb85a1e2def2c14cb0073b16ebc246bd75188.tar.gz
Moved declarations for GdkFont code inside ifndef to avoid warnings.
-rw-r--r--gtk/PlatGTK.cxx22
1 files changed, 11 insertions, 11 deletions
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx
index 7b8d42b4a..bcc965a61 100644
--- a/gtk/PlatGTK.cxx
+++ b/gtk/PlatGTK.cxx
@@ -505,17 +505,6 @@ static GdkFont *LoadFontOrSet(const char *fontspec, int characterSet) {
FontID FontCached::CreateNewFont(const char *fontName, int characterSet,
int size, bool bold, bool italic) {
- char fontset[1024];
- char fontspec[300];
- char foundary[50];
- char faceName[100];
- char charset[50];
- fontset[0] = '\0';
- fontspec[0] = '\0';
- foundary[0] = '\0';
- faceName[0] = '\0';
- charset[0] = '\0';
-
if (fontName[0] == '!') {
PangoFontDescription *pfd = pango_font_description_new();
if (pfd) {
@@ -528,6 +517,17 @@ FontID FontCached::CreateNewFont(const char *fontName, int characterSet,
}
#ifndef DISABLE_GDK_FONT
+ char fontset[1024];
+ char fontspec[300];
+ char foundary[50];
+ char faceName[100];
+ char charset[50];
+ fontset[0] = '\0';
+ fontspec[0] = '\0';
+ foundary[0] = '\0';
+ faceName[0] = '\0';
+ charset[0] = '\0';
+
GdkFont *newid = 0;
// If name of the font begins with a '-', assume, that it is
// a full fontspec.