Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2008-11-11 19:11:57 +0000
committerStijn Buys <ingar@osirion.org>2008-11-11 19:11:57 +0000
commit773c1bafe0f1d8b706e0f72e235f8466e7a9ccf5 (patch)
treeab4b3058f436a4e4c54618f132a9179ee40e330c /src/ui/scrollpane.cc
parent3082cb197fb6af7d069f9ad211ff6ea5657d924a (diff)
cleanups
Diffstat (limited to 'src/ui/scrollpane.cc')
-rw-r--r--src/ui/scrollpane.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ui/scrollpane.cc b/src/ui/scrollpane.cc
index a1de7d5..b4d08d6 100644
--- a/src/ui/scrollpane.cc
+++ b/src/ui/scrollpane.cc
@@ -57,7 +57,7 @@ void ScrollPane::dec_scroll(int scroll)
void ScrollPane::draw()
{
render::Text::setfont(font()->name().c_str(), font()->width(), font()->height());
- render::gl::enable(GL_TEXTURE_2D);
+ gl::enable(GL_TEXTURE_2D);
// text size
int text_height = (int) floorf(height() / font()->height());
@@ -161,7 +161,7 @@ void ScrollPane::draw()
current_line++;
}
- render::gl::color(palette()->text());
+ gl::color(palette()->text());
const math ::Vector2f gl(global_location());
float y = 0;
@@ -181,7 +181,7 @@ void ScrollPane::draw()
y -= font()->height();
}
}
- render::gl::disable(GL_TEXTURE_2D);
+ gl::disable(GL_TEXTURE_2D);
}
}