///////////////////////////////////////////////////////////////////////////////
-// Name: os2/toplevel.cpp
+// Name: src/os2/toplevel.cpp
// Purpose: implements wxTopLevelWindow for OS/2
// Author: Vadim Zeitlin
// Modified by:
#pragma hdrstop
#endif
+#include "wx/toplevel.h"
+
#ifndef WX_PRECOMP
#include "wx/app.h"
- #include "wx/toplevel.h"
#include "wx/dialog.h"
#include "wx/string.h"
#include "wx/log.h"
#include "wx/frame.h"
#include "wx/control.h"
#include "wx/containr.h" // wxSetFocusToChild()
+ #include "wx/settings.h"
+ #include "wx/module.h" // wxSetFocusToChild()
#endif //WX_PRECOMP
-#include "wx/module.h" // wxSetFocusToChild()
#include "wx/os2/private.h"
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// the name of the default wxWidgets class
-extern void wxAssociateWinWithHandle( HWND hWnd
- ,wxWindowOS2* pWin
- );
-bool wxTopLevelWindowOS2::m_sbInitialized = FALSE;
-wxWindow* wxTopLevelWindowOS2::m_spHiddenParent = NULL;
+extern void wxAssociateWinWithHandle( HWND hWnd, wxWindowOS2* pWin );
+
+bool wxTopLevelWindowOS2::m_sbInitialized = false;
+wxWindow* wxTopLevelWindowOS2::m_spHiddenParent = NULL;
// ============================================================================
// wxTopLevelWindowOS2 implementation
//
// The HWND of the hidden parent
//
- static HWND m_shWnd;
+ static HWND m_shWnd;
//
// The class used to create it
//
- static const wxChar* m_szClassName;
+ static const wxChar* m_szClassName;
DECLARE_DYNAMIC_CLASS(wxTLWHiddenParentModule)
}; // end of CLASS wxTLWHiddenParentModule
void wxTopLevelWindowOS2::Init()
{
- m_bIconized = m_bMaximizeOnShow = FALSE;
+ m_bIconized = m_bMaximizeOnShow = false;
//
// Unlike (almost?) all other windows, frames are created hidden
//
- m_isShown = FALSE;
+ m_isShown = false;
//
// Data to save/restore when calling ShowFullScreen
m_lFsStyle = 0;
m_lFsOldWindowStyle = 0;
- m_bFsIsMaximized = FALSE;
- m_bFsIsShowing = FALSE;
+ m_bFsIsMaximized = false;
+ m_bFsIsShowing = false;
m_hFrame = NULLHANDLE;
memset(&m_vSwp, 0, sizeof(SWP));
lMsflags |= FCF_MINBUTTON;
if (lStyle & wxMAXIMIZE_BOX)
lMsflags |= FCF_MAXBUTTON;
- if (lStyle & wxTHICK_FRAME)
+ if (lStyle & wxRESIZE_BORDER)
lMsflags |= FCF_DLGBORDER;
if (lStyle & wxSYSTEM_MENU)
lMsflags |= FCF_SYSMENU;
if (lStyle & wxTINY_CAPTION_HORIZ)
lMsflags |= FCF_TASKLIST;
- if ((lStyle & wxTHICK_FRAME) == 0)
+ if ((lStyle & wxRESIZE_BORDER) == 0)
lMsflags |= FCF_BORDER;
if (lStyle & wxFRAME_TOOL_WINDOW)
*pdwExflags = kFrameToolWindow;
wxLogSysError(wxT("Can't create dialog using template '%ld'"), ulDlgTemplate);
- return FALSE;
+ return false;
}
//
nX = (vSizeDpy.x - nWidth) / 2;
nY = (vSizeDpy.y - nHeight) / 2;
}
- m_backgroundColour.Set(wxString(wxT("LIGHT GREY")));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
LONG lColor = (LONG)m_backgroundColour.GetPixel();
,(PVOID)&lColor
))
{
- return FALSE;
+ return false;
}
+ // Convert to OS/2 coordinates
+ nY = GetOS2ParentHeight(pParent) - nY - nHeight;
+
::WinSetWindowPos( GetHwnd()
,HWND_TOP
,nX
::WinQueryWindowPos(GetHwnd(), GetSwp());
m_hFrame = m_hWnd;
SubclassWin(m_hWnd);
- return TRUE;
+ return true;
} // end of wxTopLevelWindowOS2::CreateDialog
-bool wxTopLevelWindowOS2::CreateFrame(
- const wxString& rsTitle
-, const wxPoint& rPos
-, const wxSize& rSize
-)
+bool wxTopLevelWindowOS2::CreateFrame( const wxString& rsTitle,
+ const wxPoint& rPos,
+ const wxSize& rSize )
{
- WXDWORD lExflags;
- WXDWORD lFlags = OS2GetCreateWindowFlags(&lExflags);
- long lStyle = GetWindowStyleFlag();
- int nX = rPos.x;
- int nY = rPos.y;
- int nWidth = rSize.x;
- int nHeight = rSize.y;
- ULONG ulStyleFlags = 0L;
- ERRORID vError;
- wxString sError;
- wxWindow* pParent = GetParent();
- HWND hParent;
- HWND hFrame;
- HWND hClient;
+ WXDWORD lExflags;
+ WXDWORD lFlags = OS2GetCreateWindowFlags(&lExflags);
+ long lStyle = GetWindowStyleFlag();
+ int nX = rPos.x;
+ int nY = rPos.y;
+ int nWidth = rSize.x;
+ int nHeight = rSize.y;
+ ULONG ulStyleFlags = 0L;
+ ERRORID vError;
+ wxString sError;
+ wxWindow* pParent = GetParent();
+ HWND hParent;
+ HWND hFrame;
+ HWND hClient;
if (pParent)
hParent = GetHwndOf(pParent);
// Clear the visible flag, we always call show
//
ulStyleFlags &= (unsigned long)~WS_VISIBLE;
- m_bIconized = FALSE;
+ m_bIconized = false;
//
// Create the frame window: We break ranks with other ports now
hFrame = ::WinCreateStdWindow( hParent
,ulStyleFlags // frame-window style
,(PULONG)&lFlags // window style
- ,(PSZ)wxFrameClassName // class name
- ,(PSZ)rsTitle.c_str() // window title
+ ,wxFrameClassName // class name
+ ,rsTitle.c_str() // window title
,0L // default client style
,NULLHANDLE // resource in executable file
,0 // resource id
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
wxLogError(_T("Error creating frame. Error: %s\n"), sError.c_str());
- return FALSE;
+ return false;
}
//
wxAssociateWinWithHandle(m_hWnd, this);
wxAssociateWinWithHandle(m_hFrame, this);
- m_backgroundColour.Set(wxString(wxT("MEDIUM GREY")));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
LONG lColor = (LONG)m_backgroundColour.GetPixel();
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
wxLogError(_T("Error creating frame. Error: %s\n"), sError.c_str());
- return FALSE;
+ return false;
}
//
// Now size everything. If adding a menu the client will need to be resized.
//
- if (pParent)
+ if (!OS2GetCreateWindowCoords( rPos
+ ,rSize
+ ,nX
+ ,nY
+ ,nWidth
+ ,nHeight
+ ))
{
- nY = pParent->GetSize().y - (nY + nHeight);
+ nX = nWidth = (int)CW_USEDEFAULT;
}
- else
+
+ //
+ // We can't use CW_USEDEFAULT here as we're not calling CreateWindow()
+ // and passing CW_USEDEFAULT to MoveWindow() results in resizing the
+ // window to (0, 0) size which breaks quite a lot of things, e.g. the
+ // sizer calculation in wxSizer::Fit()
+ //
+ if (nWidth == (int)CW_USEDEFAULT)
{
- RECTL vRect;
+ //
+ // The exact number doesn't matter, the dialog will be resized
+ // again soon anyhow but it should be big enough to allow
+ // calculation relying on "totalSize - clientSize > 0" work, i.e.
+ // at least greater than the title bar height
+ //
+ nWidth = nHeight = 100;
+ }
+ if (nX == (int)CW_USEDEFAULT)
+ {
+ //
+ // Centre it on the screen for now - what else can we do?
+ // TODO: We could try FCF_SHELLPOSITION but it will require moving
+ // things around a bit.
+ //
+ wxSize vSizeDpy = wxGetDisplaySize();
- ::WinQueryWindowRect(HWND_DESKTOP, &vRect);
- nY = vRect.yTop - (nY + nHeight);
+ nX = (vSizeDpy.x - nWidth) / 2;
+ nY = (vSizeDpy.y - nHeight) / 2;
}
+
+ // Convert to OS/2 coordinates
+ nY = GetOS2ParentHeight(pParent) - nY - nHeight;
+
if (!::WinSetWindowPos( m_hFrame
,HWND_TOP
,nX
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
wxLogError(_T("Error sizing frame. Error: %s\n"), sError.c_str());
- return FALSE;
+ return false;
}
lStyle = ::WinQueryWindowULong( m_hWnd
,QWL_STYLE
,QWL_STYLE
,lStyle
);
- return TRUE;
+ return true;
} // end of wxTopLevelWindowOS2::CreateFrame
bool wxTopLevelWindowOS2::Create(
if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
{
//
- // We have different dialog templates to allows creation of dialogs
+ // We have different dialog templates to allow creation of dialogs
// with & without captions under OS2indows, resizeable or not (but a
// resizeable dialog always has caption - otherwise it would look too
// strange)
m_bIconized = nShowCmd == SWP_MINIMIZE;
} // end of wxTopLevelWindowOS2::DoShowWindow
-bool wxTopLevelWindowOS2::Show(
- bool bShow
-)
+bool wxTopLevelWindowOS2::Show( bool bShow )
{
- int nShowCmd;
- SWP vSwp;
+ int nShowCmd;
+ SWP vSwp;
if (bShow != IsShown() )
{
}
else
{
- return FALSE;
+ return false;
}
if (bShow)
{
if (m_bMaximizeOnShow)
{
nShowCmd = SWP_MAXIMIZE;
- m_bMaximizeOnShow = FALSE;
+ m_bMaximizeOnShow = false;
}
else
{
if (bShow)
{
- wxActivateEvent vEvent(wxEVT_ACTIVATE, TRUE, m_windowId);
+ wxActivateEvent vEvent(wxEVT_ACTIVATE, true, m_windowId);
::WinQueryWindowPos(m_hFrame, &vSwp);
m_bIconized = ( vSwp.fl & SWP_MINIMIZE ) == SWP_MINIMIZE ;
::WinQueryWindowPos(m_hWnd, &vSwp);
::WinEnableWindow(m_hFrame, TRUE);
- //
- // Deal with children
- //
- MoveChildren(m_vSwpClient.cy - vSwp.cy);
vEvent.SetEventObject(this);
GetEventHandler()->ProcessEvent(vEvent);
}
//
if (GetParent())
{
- HWND hWndParent = GetHwndOf(GetParent());
+ HWND hWndParent = GetHwndOf(GetParent());
::WinQueryWindowPos(hWndParent, &vSwp);
m_bIconized = (vSwp.fl & SWP_MINIMIZE)==SWP_MINIMIZE;
::WinEnableWindow(hWndParent, TRUE);
}
}
- return TRUE;
+ return true;
} // end of wxTopLevelWindowOS2::Show
// ----------------------------------------------------------------------------
return (m_vSwp.fl & SWP_MAXIMIZE) == SWP_MAXIMIZE;
} // end of wxTopLevelWindowOS2::IsMaximized
-void wxTopLevelWindowOS2::Iconize(
- bool bIconize
-)
+void wxTopLevelWindowOS2::SetTitle( const wxString& title)
+{
+ SetLabel(title);
+}
+
+wxString wxTopLevelWindowOS2::GetTitle() const
+{
+ return GetLabel();
+}
+
+void wxTopLevelWindowOS2::Iconize( bool bIconize )
{
DoShowWindow(bIconize ? SWP_MINIMIZE : SWP_RESTORE);
} // end of wxTopLevelWindowOS2::Iconize
// also update the current state
::WinQueryWindowPos(m_hFrame, (PSWP)&m_vSwp);
if (m_vSwp.fl & SWP_MINIMIZE)
- ((wxTopLevelWindow*)this)->m_bIconized = TRUE;
+ ((wxTopLevelWindow*)this)->m_bIconized = true;
else
- ((wxTopLevelWindow*)this)->m_bIconized = FALSE;
+ ((wxTopLevelWindow*)this)->m_bIconized = false;
return m_bIconized;
} // end of wxTopLevelWindowOS2::IsIconized
// wxTopLevelWindowOS2 misc
// ----------------------------------------------------------------------------
-void wxTopLevelWindowOS2::SetIcon(
- const wxIcon& rIcon
-)
-{
- SetIcons(wxIconBundle(rIcon));
-} // end of wxTopLevelWindowOS2::SetIcon
-
void wxTopLevelWindowOS2::SetIcons(
const wxIconBundle& rIcons
)
//
wxTopLevelWindowBase::SetIcons(rIcons);
- const wxIcon& vIcon = rIcons.GetIcon(wxSize(32, 32));
+ const wxIcon& vIcon = rIcons.GetIconOfExactSize(32);
- if (vIcon.Ok() && vIcon.GetWidth() == 32 && vIcon.GetHeight() == 32)
+ if (vIcon.Ok())
{
::WinSendMsg( m_hFrame
,WM_SETICON
}
} // end of wxTopLevelWindowOS2::SetIcon
-bool wxTopLevelWindowOS2::EnableCloseButton(
- bool bEnable
-)
+bool wxTopLevelWindowOS2::EnableCloseButton( bool bEnable )
{
//
// Get system (a.k.a. window) menu
//
- HMENU hMenu = ::WinWindowFromID(m_hFrame, FID_SYSMENU);
+ HMENU hMenu = ::WinWindowFromID(m_hFrame, FID_SYSMENU);
if (!hMenu)
{
wxLogLastError(_T("GetSystemMenu"));
- return FALSE;
+ return false;
}
//
,(MPARAM)FCF_MENU
,(MPARAM)0
);
- return TRUE;
+ return true;
} // end of wxTopLevelWindowOS2::EnableCloseButton
// ============================================================================
{
m_shWnd = NULL;
m_szClassName = NULL;
- return TRUE;
+ return true;
} // end of wxTLWHiddenParentModule::OnInit
void wxTLWHiddenParentModule::OnExit()
m_szClassName = zHIDDEN_PARENT_CLASS;
}
}
- m_shWnd = ::WinCreateWindow( HWND_DESKTOP
- ,(PSZ)m_szClassName
- ,""
- ,0L
- ,(LONG)0L
- ,(LONG)0L
- ,(LONG)0L
- ,(LONG)0L
- ,NULLHANDLE
- ,HWND_TOP
- ,0L
- ,NULL
- ,NULL
- );
+ m_shWnd = ::WinCreateWindow( HWND_DESKTOP,
+ (PSZ)m_szClassName,
+ "",
+ 0L,
+ (LONG)0L,
+ (LONG)0L,
+ (LONG)0L,
+ (LONG)0L,
+ NULLHANDLE,
+ HWND_TOP,
+ 0L,
+ NULL,
+ NULL );
if (!m_shWnd)
{
wxLogLastError(_T("CreateWindow(hidden TLW parent)"));
projects / wxWidgets.git / blobdiff