diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-01-04 02:04:29 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-01-04 02:04:29 +0000 |
| commit | d60f16540dba5616cd8260046b44ebc2a1047065 (patch) | |
| tree | ab241efaf58ba4eeb1916763cef337a04bc15d64 /indra/llwindow/llwindowwin32.cpp | |
| parent | 0434d35c160bcd0d78b8f4e795a62155f50a6fb8 (diff) | |
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431
This turned up the following "lost" changes:
llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly
llfontgl.cpp (from maintenance r50207) - whitespace only
inventorybridge.cpp (property - non-executable)
skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL
Diffstat (limited to 'indra/llwindow/llwindowwin32.cpp')
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index ad56b97577..daa1a26b3d 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -10,6 +10,8 @@ #if LL_WINDOWS && !LL_MESA_HEADLESS +#include "llwindowwin32.h" + #include <commdlg.h> #include <WinUser.h> #include <mapi.h> @@ -20,7 +22,7 @@ #define DIRECTINPUT_VERSION 0x0800 #include <dinput.h> -#include "llwindowwin32.h" + #include "llkeyboardwin32.h" #include "llerror.h" #include "llgl.h" @@ -3023,19 +3025,6 @@ LRESULT CALLBACK LLSplashScreenWin32::windowProc(HWND h_wnd, UINT u_msg, // Helper Funcs // -HWND llwindow_get_hwnd(LLWindow *window) -{ - //assumes we are dealing with a Win32 window - return ((LLWindowWin32*)window)->mWindowHandle; -} - - -void llwindow_install_wndproc(LLWindow *window, WNDPROC wnd_proc) -{ - //assumes we are dealing with a Win32 window - ((LLWindowWin32*)window)->mWndProc = wnd_proc; -} - S32 OSMessageBoxWin32(const char* text, const char* caption, U32 type) { UINT uType; |