aboutsummaryrefslogtreecommitdiffhomepage
path: root/gtk/ScintillaGTK.cxx
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2013-09-04 11:32:27 +1000
committerNeil <nyamatongwe@gmail.com>2013-09-04 11:32:27 +1000
commit86af455e71ba0cc42e48ca712c3617da3f11c69d (patch)
tree84779f720e905321d3d4c33c924e932fa7201d5b /gtk/ScintillaGTK.cxx
parentab73f3d64f0c6caae8d7eeb35ae37aa23b5cf3c1 (diff)
downloadscintilla-mirror-86af455e71ba0cc42e48ca712c3617da3f11c69d.tar.gz
Fix namespace compilation errors when SCI_NAMESPACE defined.
Diffstat (limited to 'gtk/ScintillaGTK.cxx')
-rw-r--r--gtk/ScintillaGTK.cxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index 25d61d9f2..227a33b3f 100644
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -89,15 +89,6 @@ static GdkWindow *WindowFromWidget(GtkWidget *w) {
#endif
}
-static GdkWindow *PWindow(const Window &w) {
- GtkWidget *widget = reinterpret_cast<GtkWidget *>(w.GetID());
-#if GTK_CHECK_VERSION(3,0,0)
- return gtk_widget_get_window(widget);
-#else
- return widget->window;
-#endif
-}
-
#ifdef _MSC_VER
// Constant conditional expressions are because of GTK+ headers
#pragma warning(disable: 4127)
@@ -111,6 +102,15 @@ static GdkWindow *PWindow(const Window &w) {
using namespace Scintilla;
#endif
+static GdkWindow *PWindow(const Window &w) {
+ GtkWidget *widget = reinterpret_cast<GtkWidget *>(w.GetID());
+#if GTK_CHECK_VERSION(3,0,0)
+ return gtk_widget_get_window(widget);
+#else
+ return widget->window;
+#endif
+}
+
extern std::string UTF8FromLatin1(const char *s, int len);
class ScintillaGTK : public ScintillaBase {