diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2009-07-12 12:05:10 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2009-07-12 12:05:10 -0400 |
| commit | 6eb0af0fbf8c19ef9c73e6aba08e782cc7db745d (patch) | |
| tree | 5f322012090e91949d16bc384ad594dd2e88a4b0 | |
| parent | 8742e4b6dde051324c11d66996a0338c2eeec195 (diff) | |
| download | textadept-6eb0af0fbf8c19ef9c73e6aba08e782cc7db745d.tar.gz textadept-6eb0af0fbf8c19ef9c73e6aba08e782cc7db745d.zip | |
Use branded Scintilla structs to remove 'using namespace Scintilla' for OSX.
| -rw-r--r-- | src/lua_interface.c | 10 | ||||
| -rw-r--r-- | src/textadept.c | 1 | ||||
| -rw-r--r-- | src/textadept.h | 4 |
3 files changed, 1 insertions, 14 deletions
diff --git a/src/lua_interface.c b/src/lua_interface.c index 58a237fe..0ae9ad23 100644 --- a/src/lua_interface.c +++ b/src/lua_interface.c @@ -26,10 +26,6 @@ lua_setmetatable(l, -2); \ } -#ifdef MAC -using namespace Scintilla; -#endif - lua_State *lua; int closing = FALSE; @@ -1142,11 +1138,7 @@ static int l_cf_ta_buffer_new(lua_State *lua) { static int l_cf_buffer_text_range(lua_State *lua) { l_check_focused_buffer(lua, 1); -#ifndef MAC - struct TextRange tr; -#else - Scintilla::TextRange tr; -#endif + struct Sci_TextRange tr; tr.chrg.cpMin = luaL_checkinteger(lua, 2); tr.chrg.cpMax = luaL_checkinteger(lua, 3); int length = tr.chrg.cpMax - tr.chrg.cpMin; diff --git a/src/textadept.c b/src/textadept.c index 31c08448..6492e858 100644 --- a/src/textadept.c +++ b/src/textadept.c @@ -8,7 +8,6 @@ #include "ige-mac-menu.h" #define CFURL_TO_STR(u) \ CFStringGetCStringPtr(CFURLCopyFileSystemPath(u, kCFURLPOSIXPathStyle), 0) -using namespace Scintilla; #endif #define gbool gboolean diff --git a/src/textadept.h b/src/textadept.h index 0fd0487b..3f70202a 100644 --- a/src/textadept.h +++ b/src/textadept.h @@ -19,10 +19,6 @@ #include <lualib.h> #include <lauxlib.h> -#ifdef MAC -using namespace Scintilla; -#endif - // globals extern GtkWidget *window, *focused_editor, *command_entry, *pm_container, *pm_entry, *pm_view, *findbox, *find_entry, *replace_entry, |