#include "wx/intl.h"
#include "wx/frame.h"
#include "wx/containr.h" // wxSetFocusToChild()
+ #include "wx/module.h"
#endif //WX_PRECOMP
-#include "wx/module.h"
#include "wx/dynlib.h"
#include "wx/msw/private.h"
#if defined(__WXWINCE__) && !defined(__HANDHELDPC__)
- #include <ole2.h>
- #include <shellapi.h>
- // Standard SDK doesn't have aygshell.dll: see include/wx/msw/wince/libraries.h
- #if _WIN32_WCE < 400 || !defined(__WINCE_STANDARDSDK__)
- #include <aygshell.h>
- #endif
-#include "wx/msw/wince/missing.h"
+ #include <ole2.h>
+ #include <shellapi.h>
+ // Standard SDK doesn't have aygshell.dll: see include/wx/msw/wince/libraries.h
+ #if _WIN32_WCE < 400 || !defined(__WINCE_STANDARDSDK__)
+ #include <aygshell.h>
+ #endif
#endif
-#include "wx/msw/missing.h"
#include "wx/msw/winundef.h"
+#include "wx/msw/missing.h"
#include "wx/display.h"
// WS_EX_CONTEXTHELP is incompatible with WS_MINIMIZEBOX and WS_MAXIMIZEBOX
// and is ignored if we specify both of them, but chances are that if we
- // use wxFRAME_EX_CONTEXTHELP, we really do want to have the context help
+ // use wxWS_EX_CONTEXTHELP, we really do want to have the context help
// button while wxMINIMIZE/wxMAXIMIZE are included by default, so the help
// takes precedence
- if ( !(GetExtraStyle() & wxFRAME_EX_CONTEXTHELP) )
+ if ( !(GetExtraStyle() & wxWS_EX_CONTEXTHELP) )
{
if ( style & wxMINIMIZE_BOX )
msflags |= WS_MINIMIZEBOX;
//else: nothing to do [here]
}
- if ( GetExtraStyle() & wxFRAME_EX_CONTEXTHELP )
+ if ( GetExtraStyle() & wxWS_EX_CONTEXTHELP )
*exflags |= WS_EX_CONTEXTHELP;
#endif // !__WXWINCE__
if ( !title.empty() )
{
- ::SetWindowText(GetHwnd(), title);
+ ::SetWindowText(GetHwnd(), title.wx_str());
}
SubclassWin(m_hWnd);
const wxSize sz = IsAlwaysMaximized() ? wxDefaultSize : size;
- return MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags);
+#ifndef __WXWINCE__
+ if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
+ exflags |= WS_EX_LAYOUTRTL;
+#endif
+
+ return MSWCreate(wxCanvasClassName, title.wx_str(), pos, sz, flags, exflags);
}
bool wxTopLevelWindowMSW::Create(wxWindow *parent,
dlgTemplate->style |= WS_POPUP;
#ifndef __WXWINCE__
+ if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
+ {
+ dlgTemplate->dwExtendedStyle |= WS_EX_LAYOUTRTL;
+ }
+
// force 3D-look if necessary, it looks impossibly ugly otherwise
if ( style & (wxRESIZE_BORDER | wxCAPTION) )
dlgTemplate->style |= DS_MODALFRAME;
DoShowWindow(SW_RESTORE);
}
+void wxTopLevelWindowMSW::SetLayoutDirection(wxLayoutDirection dir)
+{
+ if ( dir == wxLayout_Default )
+ dir = wxTheApp->GetLayoutDirection();
+
+ if ( dir != wxLayout_Default )
+ wxTopLevelWindowBase::SetLayoutDirection(dir);
+}
+
+// ----------------------------------------------------------------------------
+// wxTopLevelWindowMSW geometry
+// ----------------------------------------------------------------------------
+
+#ifndef __WXWINCE__
+
+void wxTopLevelWindowMSW::DoGetPosition(int *x, int *y) const
+{
+ if ( IsIconized() )
+ {
+ WINDOWPLACEMENT wp;
+ wp.length = sizeof(WINDOWPLACEMENT);
+ if ( ::GetWindowPlacement(GetHwnd(), &wp) )
+ {
+ RECT& rc = wp.rcNormalPosition;
+
+ // the position returned by GetWindowPlacement() is in workspace
+ // coordinates except for windows with WS_EX_TOOLWINDOW style
+ if ( !HasFlag(wxFRAME_TOOL_WINDOW) )
+ {
+ // we must use the correct display for the translation as the
+ // task bar might be shown on one display but not the other one
+ int n = wxDisplay::GetFromWindow(this);
+ wxDisplay dpy(n == wxNOT_FOUND ? 0 : n);
+ const wxPoint ptOfs = dpy.GetClientArea().GetPosition() -
+ dpy.GetGeometry().GetPosition();
+
+ rc.left += ptOfs.x;
+ rc.top += ptOfs.y;
+ }
+
+ if ( x )
+ *x = rc.left;
+ if ( y )
+ *y = rc.top;
+
+ return;
+ }
+
+ wxLogLastError(_T("GetWindowPlacement"));
+ }
+ //else: normal case
+
+ wxTopLevelWindowBase::DoGetPosition(x, y);
+}
+
+void wxTopLevelWindowMSW::DoGetSize(int *width, int *height) const
+{
+ if ( IsIconized() )
+ {
+ WINDOWPLACEMENT wp;
+ wp.length = sizeof(WINDOWPLACEMENT);
+ if ( ::GetWindowPlacement(GetHwnd(), &wp) )
+ {
+ const RECT& rc = wp.rcNormalPosition;
+
+ if ( width )
+ *width = rc.right - rc.left;
+ if ( height )
+ *height = rc.bottom - rc.top;
+
+ return;
+ }
+
+ wxLogLastError(_T("GetWindowPlacement"));
+ }
+ //else: normal case
+
+ wxTopLevelWindowBase::DoGetSize(width, height);
+}
+
+#endif // __WXWINCE__
+
// ----------------------------------------------------------------------------
// wxTopLevelWindowMSW fullscreen
// ----------------------------------------------------------------------------
return GetLabel();
}
-void wxTopLevelWindowMSW::SetIcon(const wxIcon& icon)
-{
- SetIcons( wxIconBundle( icon ) );
-}
-
void wxTopLevelWindowMSW::SetIcons(const wxIconBundle& icons)
{
wxTopLevelWindowBase::SetIcons(icons);
#if !defined(__WXMICROWIN__)
- const wxIcon& sml = icons.GetIcon( wxSize( 16, 16 ) );
- if( sml.Ok() && sml.GetWidth() == 16 && sml.GetHeight() == 16 )
+ const wxIcon& sml = icons.GetIconOfExactSize(16);
+ if( sml.Ok() )
{
::SendMessage( GetHwndOf( this ), WM_SETICON, ICON_SMALL,
(LPARAM)GetHiconOf(sml) );
}
- const wxIcon& big = icons.GetIcon( wxSize( 32, 32 ) );
- if( big.Ok() && big.GetWidth() == 32 && big.GetHeight() == 32 )
+ const wxIcon& big = icons.GetIconOfExactSize(32);
+ if( big.Ok() )
{
::SendMessage( GetHwndOf( this ), WM_SETICON, ICON_BIG,
(LPARAM)GetHiconOf(big) );
// ---------------------------------------------------------------------------
-bool wxTopLevelWindowMSW::SetTranslucency(int alpha)
+bool wxTopLevelWindowMSW::SetTransparent(wxByte alpha)
{
typedef DWORD (WINAPI *PSETLAYEREDWINDOWATTR)(HWND, DWORD, BYTE, DWORD);
static PSETLAYEREDWINDOWATTR pSetLayeredWindowAttributes = NULL;
- if (alpha < 0) alpha = 0;
- if (alpha > 255) alpha = 255;
-
if ( pSetLayeredWindowAttributes == NULL )
{
wxDynamicLibrary dllUser32(_T("user32.dll"));
if ((exstyle & WS_EX_LAYERED) == 0 )
SetWindowLong(GetHwnd(), GWL_EXSTYLE, exstyle | WS_EX_LAYERED);
- return pSetLayeredWindowAttributes(GetHwnd(), 0, (BYTE)alpha, LWA_ALPHA) != 0;
+ return pSetLayeredWindowAttributes(GetHwnd(), 0, (BYTE)alpha, LWA_ALPHA) != 0;
}
-bool wxTopLevelWindowMSW::CanSetTranslucency()
+bool wxTopLevelWindowMSW::CanSetTransparent()
{
// The API is available on win2k and above
-
+
static int os_type = -1;
static int ver_major = -1;
if (os_type == -1)
os_type = ::wxGetOsVersion(&ver_major);
- return (os_type == wxWINDOWS_NT && ver_major >= 5);
+ return (os_type == wxOS_WINDOWS_NT && ver_major >= 5);
}
// ----------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff