projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get the page title from the IHtmlDocument rather than the bowser as it actually retur...
[wxWidgets.git]
/
src
/
os2
/
toplevel.cpp
diff --git
a/src/os2/toplevel.cpp
b/src/os2/toplevel.cpp
index ff1c6d70e9f80ba7d3a77ba14ba9359b8ecd5d5f..b60548850154fe81e5ad1e2a7275b766037d91d3 100644
(file)
--- a/
src/os2/toplevel.cpp
+++ b/
src/os2/toplevel.cpp
@@
-6,7
+6,7
@@
// Created: 30.12.01
// RCS-ID: $Id$
// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
// Created: 30.12.01
// RCS-ID: $Id$
// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licen
s
e: wxWindows licence
+// Licen
c
e: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
@@
-150,7
+150,7
@@
void wxTopLevelWindowOS2::Init()
m_hFrame = NULLHANDLE;
memset(&m_vSwp, 0, sizeof(SWP));
memset(&m_vSwpClient, 0, sizeof(SWP));
m_hFrame = NULLHANDLE;
memset(&m_vSwp, 0, sizeof(SWP));
memset(&m_vSwpClient, 0, sizeof(SWP));
- m_pWinLastFocused =
(wxWindow *)
NULL;
+ m_pWinLastFocused = NULL;
} // end of wxTopLevelWindowIOS2::Init
void wxTopLevelWindowOS2::OnActivate(
} // end of wxTopLevelWindowIOS2::Init
void wxTopLevelWindowOS2::OnActivate(
@@
-162,7
+162,7
@@
void wxTopLevelWindowOS2::OnActivate(
//
// Restore focus to the child which was last focused
//
//
// Restore focus to the child which was last focused
//
- wxLogTrace(
_T("focus"), _
T("wxTLW %08lx activated."), m_hWnd);
+ wxLogTrace(
wxT("focus"), wx
T("wxTLW %08lx activated."), m_hWnd);
wxWindow* pParent = m_pWinLastFocused ? m_pWinLastFocused->GetParent()
: NULL;
wxWindow* pParent = m_pWinLastFocused ? m_pWinLastFocused->GetParent()
: NULL;
@@
-200,8
+200,8
@@
void wxTopLevelWindowOS2::OnActivate(
pWin = pWin->GetParent();
}
pWin = pWin->GetParent();
}
- wxLogTrace(
_
T("focus"),
-
_
T("wxTLW %08lx deactivated, last focused: %08lx."),
+ wxLogTrace(
wx
T("focus"),
+
wx
T("wxTLW %08lx deactivated, last focused: %08lx."),
m_hWnd,
m_pWinLastFocused ? GetHwndOf(m_pWinLastFocused)
: NULL);
m_hWnd,
m_pWinLastFocused ? GetHwndOf(m_pWinLastFocused)
: NULL);
@@
-246,9
+246,7
@@
WXDWORD wxTopLevelWindowOS2::OS2GetStyle(
// Invalid for frame windows under PM
}
// Invalid for frame windows under PM
}
- if (lStyle & wxTINY_CAPTION_VERT)
- lMsflags |= FCF_TASKLIST;
- if (lStyle & wxTINY_CAPTION_HORIZ)
+ if (lStyle & wxTINY_CAPTION)
lMsflags |= FCF_TASKLIST;
if ((lStyle & wxRESIZE_BORDER) == 0)
lMsflags |= FCF_TASKLIST;
if ((lStyle & wxRESIZE_BORDER) == 0)
@@
-281,7
+279,7
@@
WXHWND wxTopLevelWindowOS2::OS2GetParent() const
//
// This flag doesn't make sense then and will be ignored
//
//
// This flag doesn't make sense then and will be ignored
//
- wxFAIL_MSG(
_
T("wxFRAME_FLOAT_ON_PARENT but no parent?") );
+ wxFAIL_MSG(
wx
T("wxFRAME_FLOAT_ON_PARENT but no parent?") );
}
else
{
}
else
{
@@
-495,7
+493,7
@@
bool wxTopLevelWindowOS2::CreateFrame( const wxString& rsTitle,
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
- wxLogError(
_
T("Error creating frame. Error: %s\n"), sError.c_str());
+ wxLogError(
wx
T("Error creating frame. Error: %s\n"), sError.c_str());
return false;
}
return false;
}
@@
-519,7
+517,7
@@
bool wxTopLevelWindowOS2::CreateFrame( const wxString& rsTitle,
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
- wxLogError(
_
T("Error creating frame. Error: %s\n"), sError.c_str());
+ wxLogError(
wx
T("Error creating frame. Error: %s\n"), sError.c_str());
return false;
}
return false;
}
@@
-588,7
+586,7
@@
bool wxTopLevelWindowOS2::CreateFrame( const wxString& rsTitle,
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
- wxLogError(
_
T("Error sizing frame. Error: %s\n"), sError.c_str());
+ wxLogError(
wx
T("Error sizing frame. Error: %s\n"), sError.c_str());
return false;
}
lStyle = ::WinQueryWindowULong( m_hWnd
return false;
}
lStyle = ::WinQueryWindowULong( m_hWnd
@@
-640,8
+638,8
@@
bool wxTopLevelWindowOS2::Create(
{
//
// We have different dialog templates to allow creation of dialogs
{
//
// We have different dialog templates to allow creation of dialogs
- // with & without captions under OS2indows, resiz
e
able or not (but a
- // resiz
e
able dialog always has caption - otherwise it would look too
+ // with & without captions under OS2indows, resizable or not (but a
+ // resizable dialog always has caption - otherwise it would look too
// strange)
//
ULONG ulDlgTemplate;
// strange)
//
ULONG ulDlgTemplate;
@@
-1041,7
+1039,7
@@
bool wxTopLevelWindowOS2::EnableCloseButton( bool bEnable )
if (!hMenu)
{
if (!hMenu)
{
- wxLogLastError(
_
T("GetSystemMenu"));
+ wxLogLastError(
wx
T("GetSystemMenu"));
return false;
}
return false;
}
@@
-1093,7
+1091,7
@@
void wxTLWHiddenParentModule::OnExit()
{
if (!::WinDestroyWindow(m_shWnd))
{
{
if (!::WinDestroyWindow(m_shWnd))
{
- wxLogLastError(
_
T("DestroyWindow(hidden TLW parent)"));
+ wxLogLastError(
wx
T("DestroyWindow(hidden TLW parent)"));
}
m_shWnd = NULL;
}
}
m_shWnd = NULL;
}
@@
-1108,7
+1106,7
@@
HWND wxTLWHiddenParentModule::GetHWND()
{
if (!m_szClassName)
{
{
if (!m_szClassName)
{
- static const wxChar* zHIDDEN_PARENT_CLASS =
_
T("wxTLWHiddenParent");
+ static const wxChar* zHIDDEN_PARENT_CLASS =
wx
T("wxTLWHiddenParent");
if (!::WinRegisterClass( wxGetInstance()
,(PSZ)zHIDDEN_PARENT_CLASS
if (!::WinRegisterClass( wxGetInstance()
,(PSZ)zHIDDEN_PARENT_CLASS
@@
-1117,7
+1115,7
@@
HWND wxTLWHiddenParentModule::GetHWND()
,sizeof(ULONG)
))
{
,sizeof(ULONG)
))
{
- wxLogLastError(
_
T("RegisterClass(\"wxTLWHiddenParent\")"));
+ wxLogLastError(
wx
T("RegisterClass(\"wxTLWHiddenParent\")"));
}
else
{
}
else
{
@@
-1139,7
+1137,7
@@
HWND wxTLWHiddenParentModule::GetHWND()
NULL );
if (!m_shWnd)
{
NULL );
if (!m_shWnd)
{
- wxLogLastError(
_
T("CreateWindow(hidden TLW parent)"));
+ wxLogLastError(
wx
T("CreateWindow(hidden TLW parent)"));
}
}
return m_shWnd;
}
}
return m_shWnd;