diff options
| author | Adam Moss <moss@lindenlab.com> | 2007-02-12 17:20:51 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2007-02-12 17:20:51 +0000 |
| commit | d1daa178599ac6320be641258931417bc2dd8b0e (patch) | |
| tree | 68b5481c834d10bf530b3e2c157fb7fc34d307f3 /indra/llwindow/llwindowsdl.h | |
| parent | 5cc44523f79b6cf495d2649fce9bf9e5181787e8 (diff) | |
Landing embedded Mozilla support for the Linux Client.
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@57782
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxmozilla-r57782base
Diffstat (limited to 'indra/llwindow/llwindowsdl.h')
| -rw-r--r-- | indra/llwindow/llwindowsdl.h | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h index 704262061a..f9fed99206 100644 --- a/indra/llwindow/llwindowsdl.h +++ b/indra/llwindow/llwindowsdl.h @@ -93,7 +93,17 @@ public: /*virtual*/ void *getPlatformWindow(); /*virtual*/ void bringToFront(); - + + // Not great that these are public, but they have to be accessible + // by non-class code and it's better than making them global. +#if LL_X11 + // These are set up by the X11 clipboard initialization code + Window mSDL_XWindowID; + Display *mSDL_Display; +#endif + void (*Lock_Display)(void); + void (*Unlock_Display)(void); + protected: LLWindowSDL( char *title, int x, int y, int width, int height, U32 flags, @@ -160,10 +170,6 @@ protected: #if LL_X11 private: - // These are set up by the X11 clipboard initialization code - Window mSDL_XWindowID; - void (*Lock_Display)(void); - void (*Unlock_Display)(void); // more X11 clipboard stuff int init_x11clipboard(void); void quit_x11clipboard(void); @@ -195,4 +201,14 @@ S32 OSMessageBoxSDL(const char* text, const char* caption, U32 type); void load_url_external(const char* url); void shell_open( const char* file_path ); +#if LL_GTK +// Lazily initialize and check the runtime GTK version for goodness. +BOOL ll_try_gtk_init(void); +#endif // LL_GTK + +#if LL_X11 +Window get_SDL_XWindowID(void); +Display* get_SDL_Display(void); +#endif // LL_X11 + #endif //LL_LLWINDOWSDL_H |