Commit 68129313 authored by zecke@webkit.org's avatar zecke@webkit.org

[GTK] Move the #ifdef around for a buildfix for Gtk+ on OSX

When building Gtk+ on OSX we ended up declaring
setNPWindowIfNeeded twice. Fix that by moving
the #if PLATFORM(GTK) up and using elif instead of
else.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@43633 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 571b6b04
2009-05-13 Holger Hans Peter Freyther <zecke@selfish.org>
Rubber Stamped by Gustavo Noronha.
[GTK] Move the #ifdef around for a buildfix for Gtk+ on OSX
When building Gtk+ on OSX we ended up declaring
setNPWindowIfNeeded twice. Fix that by moving
the #if PLATFORM(GTK) up and using elif instead of
else.
* plugins/PluginView.h:
2009-05-13 Holger Hans Peter Freyther <zecke@selfish.org>
Reviewed by Xan Lopez.
......@@ -288,7 +288,9 @@ public:
private:
#if defined(XP_MACOSX)
#if PLATFORM(GTK) || defined(Q_WS_X11)
void setNPWindowIfNeeded();
#elif defined(XP_MACOSX)
NP_CGContext m_npCgContext;
OwnPtr<Timer<PluginView> > m_nullEventTimer;
......@@ -296,9 +298,6 @@ private:
void nullEventTimerFired(Timer<PluginView>*);
Point globalMousePosForPlugin() const;
#endif
#if PLATFORM(GTK) || defined(Q_WS_X11)
void setNPWindowIfNeeded();
#endif
IntRect m_clipRect; // The clip rect to apply to a windowed plug-in
IntRect m_windowRect; // Our window rect.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment