diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llwindow/llwindowsdl.h | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/linden/indra/llwindow/llwindowsdl.h b/linden/indra/llwindow/llwindowsdl.h index a395ccd..547fe12 100644 --- a/linden/indra/llwindow/llwindowsdl.h +++ b/linden/indra/llwindow/llwindowsdl.h | |||
@@ -89,6 +89,7 @@ public: | |||
89 | /*virtual*/ void setFSAASamples(const U32 samples); | 89 | /*virtual*/ void setFSAASamples(const U32 samples); |
90 | /*virtual*/ BOOL restoreGamma(); // Restore original gamma table (before updating gamma) | 90 | /*virtual*/ BOOL restoreGamma(); // Restore original gamma table (before updating gamma) |
91 | /*virtual*/ ESwapMethod getSwapMethod() { return mSwapMethod; } | 91 | /*virtual*/ ESwapMethod getSwapMethod() { return mSwapMethod; } |
92 | /*virtual*/ void processMiscNativeEvents(); | ||
92 | /*virtual*/ void gatherInput(); | 93 | /*virtual*/ void gatherInput(); |
93 | /*virtual*/ void swapBuffers(); | 94 | /*virtual*/ void swapBuffers(); |
94 | 95 | ||
@@ -129,6 +130,16 @@ public: | |||
129 | void (*Lock_Display)(void); | 130 | void (*Lock_Display)(void); |
130 | void (*Unlock_Display)(void); | 131 | void (*Unlock_Display)(void); |
131 | 132 | ||
133 | #if LL_GTK | ||
134 | // Lazily initialize and check the runtime GTK version for goodness. | ||
135 | static bool ll_try_gtk_init(void); | ||
136 | #endif // LL_GTK | ||
137 | |||
138 | #if LL_X11 | ||
139 | static Window get_SDL_XWindowID(void); | ||
140 | static Display* get_SDL_Display(void); | ||
141 | #endif // LL_X11 | ||
142 | |||
132 | protected: | 143 | protected: |
133 | LLWindowSDL( | 144 | LLWindowSDL( |
134 | const std::string& title, int x, int y, int width, int height, U32 flags, | 145 | const std::string& title, int x, int y, int width, int height, U32 flags, |
@@ -205,8 +216,6 @@ private: | |||
205 | BOOL mFlashing; | 216 | BOOL mFlashing; |
206 | LLTimer mFlashTimer; | 217 | LLTimer mFlashTimer; |
207 | #endif //LL_X11 | 218 | #endif //LL_X11 |
208 | |||
209 | |||
210 | }; | 219 | }; |
211 | 220 | ||
212 | 221 | ||
@@ -223,16 +232,4 @@ public: | |||
223 | 232 | ||
224 | S32 OSMessageBoxSDL(const std::string& text, const std::string& caption, U32 type); | 233 | S32 OSMessageBoxSDL(const std::string& text, const std::string& caption, U32 type); |
225 | 234 | ||
226 | void load_url_external(const char* url); | ||
227 | |||
228 | #if LL_GTK | ||
229 | // Lazily initialize and check the runtime GTK version for goodness. | ||
230 | BOOL ll_try_gtk_init(void); | ||
231 | #endif // LL_GTK | ||
232 | |||
233 | #if LL_X11 | ||
234 | Window get_SDL_XWindowID(void); | ||
235 | Display* get_SDL_Display(void); | ||
236 | #endif // LL_X11 | ||
237 | |||
238 | #endif //LL_LLWINDOWSDL_H | 235 | #endif //LL_LLWINDOWSDL_H |