diff options
| author | Neil <nyamatongwe@gmail.com> | 2013-09-04 11:32:27 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2013-09-04 11:32:27 +1000 |
| commit | 824bda1603222f547f2eb4b37ebf8635fa54b56d (patch) | |
| tree | 0209f30a89c13604194dcb6ff180be61f0a0a913 /gtk/ScintillaGTK.cxx | |
| parent | 6a97e1876037907f5b7bfd3f006cec783212a7ba (diff) | |
| download | scintilla-mirror-824bda1603222f547f2eb4b37ebf8635fa54b56d.tar.gz | |
Fix namespace compilation errors when SCI_NAMESPACE defined.
Diffstat (limited to 'gtk/ScintillaGTK.cxx')
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 18 |
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 { |
