fixed GetWeekOfYear() for first/last week in some cases (patch 908793)

[wxWidgets.git] / src / msw / toplevel.cpp

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 513390591ff8f17015cc2897e6e7f389e3117c31..af3dd6758645438acbf1284067f335c19c33e20b 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -6,7 +6,7 @@
 // Created:     24.09.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     24.09.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)

-// License:     wxWidgets licence
+// License:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -40,13 +40,14 @@
 #endif //WX_PRECOMP
 
 #include "wx/module.h"
 #endif //WX_PRECOMP
 
 #include "wx/module.h"

+#include "wx/dynlib.h"

 
 #include "wx/msw/private.h"
 
 #include "wx/msw/private.h"

-#if defined(__WXWINCE__)
+#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
   #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(WCE_PLATFORM_STANDARDSDK)
+  #if _WIN32_WCE < 400 || !defined(__WINCE_STANDARDSDK__)

     #include <aygshell.h>
   #endif
 #include "wx/msw/wince/missing.h"
     #include <aygshell.h>
   #endif
 #include "wx/msw/wince/missing.h"


@@ -71,8 +72,8 @@
 
 #ifdef __WXMICROWIN__
 
 
 #ifdef __WXMICROWIN__
 

-// static inline bool IsIconic(HWND WXUNUSED(hwnd)) { return FALSE; }
-static inline bool IsZoomed(HWND WXUNUSED(hwnd)) { return FALSE; }
+// static inline bool IsIconic(HWND WXUNUSED(hwnd)) { return false; }
+static inline bool IsZoomed(HWND WXUNUSED(hwnd)) { return false; }

 
 #endif // __WXMICROWIN__
 
 
 #endif // __WXMICROWIN__
 


@@ -134,15 +135,19 @@ END_EVENT_TABLE()
 void wxTopLevelWindowMSW::Init()
 {
     m_iconized =
 void wxTopLevelWindowMSW::Init()
 {
     m_iconized =

-    m_maximizeOnShow = FALSE;
+    m_maximizeOnShow = false;

 
     // Data to save/restore when calling ShowFullScreen
     m_fsStyle = 0;
     m_fsOldWindowStyle = 0;
 
     // Data to save/restore when calling ShowFullScreen
     m_fsStyle = 0;
     m_fsOldWindowStyle = 0;

-    m_fsIsMaximized = FALSE;
-    m_fsIsShowing = FALSE;
+    m_fsIsMaximized = false;
+    m_fsIsShowing = false;

 
     m_winLastFocused = (wxWindow *)NULL;
 
     m_winLastFocused = (wxWindow *)NULL;

+
+#ifdef __SMARTPHONE__
+    m_MenuBarHWND = 0;
+#endif

 }
 
 WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
 }
 
 WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const


@@ -214,7 +219,7 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
     if ( exflags )
     {
         // there is no taskbar under CE, so omit all this
     if ( exflags )
     {
         // there is no taskbar under CE, so omit all this

-#ifndef __WXWINCE__
+#if !defined(__WXWINCE__)

         if ( !(GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) )
         {
             if ( style & wxFRAME_TOOL_WINDOW )
         if ( !(GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) )
         {
             if ( style & wxFRAME_TOOL_WINDOW )


@@ -338,7 +343,7 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
 
         wxLogSysError(wxT("Can't create dialog using memory template"));
 
 
         wxLogSysError(wxT("Can't create dialog using memory template"));
 

-        return FALSE;
+        return false;

     }
 
     WXDWORD exflags;
     }
 
     WXDWORD exflags;


@@ -388,7 +393,7 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
         y = (sizeDpy.y - h) / 2;
     }
 
         y = (sizeDpy.y - h) / 2;
     }
 

-#ifndef __WXWINCE__
+#if !defined(__WXWINCE__) || defined(__WINCE_STANDARDSDK__)

     if ( !::MoveWindow(GetHwnd(), x, y, w, h, FALSE) )
     {
         wxLogLastError(wxT("MoveWindow"));
     if ( !::MoveWindow(GetHwnd(), x, y, w, h, FALSE) )
     {
         wxLogLastError(wxT("MoveWindow"));


@@ -402,7 +407,7 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
 
     SubclassWin(m_hWnd);
 
 
     SubclassWin(m_hWnd);
 

-    return TRUE;
+    return true;

 #endif // __WXMICROWIN__/!__WXMICROWIN__
 }
 
 #endif // __WXMICROWIN__/!__WXMICROWIN__
 }
 


@@ -413,13 +418,14 @@ bool wxTopLevelWindowMSW::CreateFrame(const wxString& title,
     WXDWORD exflags;
     WXDWORD flags = MSWGetCreateWindowFlags(&exflags);
 
     WXDWORD exflags;
     WXDWORD flags = MSWGetCreateWindowFlags(&exflags);
 

-#if (defined(_WIN32_WCE) && _WIN32_WCE < 400) || \
-    defined(WIN32_PLATFORM_PSPC) || \
-    defined(__SMARTPHONE__)
-       // Always expand to fit the screen in PocketPC or SmartPhone
-       wxSize sz(wxDefaultSize);
+#if !defined(__HANDHELDPC__) && ((defined(_WIN32_WCE) && _WIN32_WCE < 400) || \
+    defined(__POCKETPC__) || \
+    defined(__SMARTPHONE__))
+    // Always expand to fit the screen in PocketPC or SmartPhone
+    wxSize sz(wxDefaultSize);
+    wxUnusedVar(size);

 #else // other (including normal desktop) Windows
 #else // other (including normal desktop) Windows

-       wxSize sz(size);
+    wxSize sz(size);

 #endif
 
     return MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags);
 #endif
 
     return MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags);


@@ -448,7 +454,7 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
 
     SetName(name);
 
 
     SetName(name);
 

-    m_windowId = id == -1 ? NewControlId() : id;
+    m_windowId = id == wxID_ANY ? NewControlId() : id;

 
     wxTopLevelWindows.Append(this);
 
 
     wxTopLevelWindows.Append(this);
 


@@ -506,7 +512,7 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
     // fix we have
     if ( ret )
     {
     // fix we have
     if ( ret )
     {

-        SendMessage
+        ::SendMessage

         (
             GetHwnd(),
             WM_UPDATEUISTATE,
         (
             GetHwnd(),
             WM_UPDATEUISTATE,


@@ -515,10 +521,16 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
         );
     }
 
         );
     }
 

-       // Native look is full screen window on Smartphones
-#ifdef __SMARTPHONE__
+    // Native look is full screen window on Smartphones and Standard SDK
+#if defined(__WXWINCE__)

     if ( style & wxMAXIMIZE )
     if ( style & wxMAXIMIZE )

-           Maximize();
+    {
+        this->Maximize();
+    }
+#endif
+
+#ifdef __SMARTPHONE__
+    SetRightMenu(); // to nothing for initialization

 #endif
 
     return ret;
 #endif
 
     return ret;


@@ -555,7 +567,7 @@ bool wxTopLevelWindowMSW::Show(bool show)
 {
     // don't use wxWindow version as we want to call DoShowWindow() ourselves
     if ( !wxWindowBase::Show(show) )
 {
     // don't use wxWindow version as we want to call DoShowWindow() ourselves
     if ( !wxWindowBase::Show(show) )

-        return FALSE;
+        return false;

 
     int nShowCmd;
     if ( show )
 
     int nShowCmd;
     if ( show )


@@ -565,7 +577,12 @@ bool wxTopLevelWindowMSW::Show(bool show)
             // show and maximize
             nShowCmd = SW_MAXIMIZE;
 
             // show and maximize
             nShowCmd = SW_MAXIMIZE;
 

-            m_maximizeOnShow = FALSE;
+            // This is necessary, or no window appears
+#ifdef __WINCE_STANDARDSDK__
+            DoShowWindow(SW_SHOW);
+#endif
+
+            m_maximizeOnShow = false;

         }
         else // just show
         {
         }
         else // just show
         {


@@ -582,11 +599,18 @@ bool wxTopLevelWindowMSW::Show(bool show)
 
     DoShowWindow(nShowCmd);
 
 
     DoShowWindow(nShowCmd);
 

+#if defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__))
+    // Addornments have to be added when the frame is the correct size
+    wxFrame* frame = wxDynamicCast(this, wxFrame);
+    if (frame && frame->GetMenuBar())
+        frame->GetMenuBar()->AddAdornments(GetWindowStyleFlag());
+#endif
+

     if ( show )
     {
         ::BringWindowToTop(GetHwnd());
 
     if ( show )
     {
         ::BringWindowToTop(GetHwnd());
 

-        wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_windowId);
+        wxActivateEvent event(wxEVT_ACTIVATE, true, m_windowId);

         event.SetEventObject( this );
         GetEventHandler()->ProcessEvent(event);
     }
         event.SetEventObject( this );
         GetEventHandler()->ProcessEvent(event);
     }


@@ -601,7 +625,7 @@ bool wxTopLevelWindowMSW::Show(bool show)
         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -626,7 +650,7 @@ void wxTopLevelWindowMSW::Maximize(bool maximize)
 bool wxTopLevelWindowMSW::IsMaximized() const
 {
 #ifdef __WXWINCE__
 bool wxTopLevelWindowMSW::IsMaximized() const
 {
 #ifdef __WXWINCE__

-    return FALSE;
+    return false;

 #else
     return ::IsZoomed(GetHwnd()) != 0;
 #endif
 #else
     return ::IsZoomed(GetHwnd()) != 0;
 #endif


@@ -640,7 +664,7 @@ void wxTopLevelWindowMSW::Iconize(bool iconize)
 bool wxTopLevelWindowMSW::IsIconized() const
 {
 #ifdef __WXWINCE__
 bool wxTopLevelWindowMSW::IsIconized() const
 {
 #ifdef __WXWINCE__

-    return FALSE;
+    return false;

 #else
     // also update the current state
     ((wxTopLevelWindowMSW *)this)->m_iconized = ::IsIconic(GetHwnd()) != 0;
 #else
     // also update the current state
     ((wxTopLevelWindowMSW *)this)->m_iconized = ::IsIconic(GetHwnd()) != 0;


@@ -663,7 +687,7 @@ bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style)
     if ( show == IsFullScreen() )
     {
         // nothing to do
     if ( show == IsFullScreen() )
     {
         // nothing to do

-        return TRUE;
+        return true;

     }
 
     m_fsIsShowing = show;
     }
 
     m_fsIsShowing = show;


@@ -744,7 +768,7 @@ bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style)
                      rect.x, rect.y, rect.width, rect.height,
                      flags);
 
                      rect.x, rect.y, rect.width, rect.height,
                      flags);
 

-#if defined(__WXWINCE__) && _WIN32_WCE < 400
+#if !defined(__HANDHELDPC__) && (defined(__WXWINCE__) && (_WIN32_WCE < 400))

         ::SHFullScreen(GetHwnd(), SHFS_HIDETASKBAR | SHFS_HIDESIPBUTTON);
 #endif
 
         ::SHFullScreen(GetHwnd(), SHFS_HIDETASKBAR | SHFS_HIDESIPBUTTON);
 #endif
 


@@ -754,7 +778,7 @@ bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style)
     }
     else // stop showing full screen
     {
     }
     else // stop showing full screen
     {

-#if defined(__WXWINCE__) && _WIN32_WCE < 400
+#if !defined(__HANDHELDPC__) && (defined(__WXWINCE__) && (_WIN32_WCE < 400))

         ::SHFullScreen(GetHwnd(), SHFS_SHOWTASKBAR | SHFS_SHOWSIPBUTTON);
 #endif
         Maximize(m_fsIsMaximized);
         ::SHFullScreen(GetHwnd(), SHFS_SHOWTASKBAR | SHFS_SHOWSIPBUTTON);
 #endif
         Maximize(m_fsIsMaximized);


@@ -763,7 +787,7 @@ bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style)
             m_fsOldSize.width, m_fsOldSize.height, SWP_FRAMECHANGED);
     }
 
             m_fsOldSize.width, m_fsOldSize.height, SWP_FRAMECHANGED);
     }
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -816,7 +840,7 @@ bool wxTopLevelWindowMSW::EnableCloseButton(bool enable)
     {
         wxLogLastError(_T("EnableMenuItem(SC_CLOSE)"));
 
     {
         wxLogLastError(_T("EnableMenuItem(SC_CLOSE)"));
 

-        return FALSE;
+        return false;

     }
 #ifndef __WXWINCE__
     // update appearance immediately
     }
 #ifndef __WXWINCE__
     // update appearance immediately


@@ -827,14 +851,14 @@ bool wxTopLevelWindowMSW::EnableCloseButton(bool enable)
 #endif
 #endif // !__WXMICROWIN__
 
 #endif
 #endif // !__WXMICROWIN__
 

-    return TRUE;
+    return true;

 }
 
 #ifndef __WXWINCE__
 
 bool wxTopLevelWindowMSW::SetShape(const wxRegion& region)
 {
 }
 
 #ifndef __WXWINCE__
 
 bool wxTopLevelWindowMSW::SetShape(const wxRegion& region)
 {

-    wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), FALSE,
+    wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,

                  _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
 
     // The empty region signifies that the shape should be removed from the
                  _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
 
     // The empty region signifies that the shape should be removed from the


@@ -844,9 +868,9 @@ bool wxTopLevelWindowMSW::SetShape(const wxRegion& region)
         if (::SetWindowRgn(GetHwnd(), NULL, TRUE) == 0)
         {
             wxLogLastError(_T("SetWindowRgn"));
         if (::SetWindowRgn(GetHwnd(), NULL, TRUE) == 0)
         {
             wxLogLastError(_T("SetWindowRgn"));

-            return FALSE;
+            return false;

         }
         }

-        return TRUE;
+        return true;

     }
 
     // Windows takes ownership of the region, so
     }
 
     // Windows takes ownership of the region, so


@@ -871,13 +895,60 @@ bool wxTopLevelWindowMSW::SetShape(const wxRegion& region)
     if (::SetWindowRgn(GetHwnd(), hrgn, TRUE) == 0)
     {
         wxLogLastError(_T("SetWindowRgn"));
     if (::SetWindowRgn(GetHwnd(), hrgn, TRUE) == 0)
     {
         wxLogLastError(_T("SetWindowRgn"));

-        return FALSE;
+        return false;

     }
     }

-    return TRUE;
+    return true;

 }
 
 #endif // !__WXWINCE__
 
 }
 
 #endif // !__WXWINCE__
 

+void wxTopLevelWindowMSW::RequestUserAttention(int flags)
+{
+    // check if we can use FlashWindowEx(): unfortunately an explicit test for
+    // FLASHW_STOP, for example, doesn't work because MSVC6 headers do #define
+    // it but don't provide FlashWindowEx() declaration
+#if WINVER >= 0x0500
+    // available in the headers, check if it is supported by the system
+    typedef BOOL (WINAPI *FlashWindowEx_t)(FLASHWINFO *pfwi);
+    FlashWindowEx_t s_pfnFlashWindowEx = NULL;
+    if ( !s_pfnFlashWindowEx )
+    {
+        wxDynamicLibrary dllUser32(_T("user32.dll"));
+        s_pfnFlashWindowEx = (FlashWindowEx_t)
+                                dllUser32.GetSymbol(_T("FlashWindowEx"));
+
+        // we can safely unload user32.dll here, it's goign to remain loaded as
+        // long as the program is running anyhow
+    }
+
+    if ( s_pfnFlashWindowEx )
+    {
+        WinStruct<FLASHWINFO> fwi;
+        fwi.hwnd = GetHwnd();
+        fwi.dwFlags = FLASHW_ALL;
+        if ( flags & wxUSER_ATTENTION_INFO )
+        {
+            // just flash a few times
+            fwi.uCount = 3;
+        }
+        else // wxUSER_ATTENTION_ERROR
+        {
+            // flash until the user notices it
+            fwi.dwFlags |= FLASHW_TIMERNOFG;
+        }
+
+        s_pfnFlashWindowEx(&fwi);
+    }
+    else // FlashWindowEx() not available
+#endif // FlashWindowEx() defined
+    {
+        wxUnusedVar(flags);
+#ifndef __WXWINCE__
+        ::FlashWindow(GetHwnd(), TRUE);
+#endif // __WXWINCE__
+    }
+}
+

 // ----------------------------------------------------------------------------
 // wxTopLevelWindow event handling
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTopLevelWindow event handling
 // ----------------------------------------------------------------------------


@@ -950,11 +1021,14 @@ wxDlgProc(HWND hDlg,
 
         // Standard SDK doesn't have aygshell.dll: see
         // include/wx/msw/wince/libraries.h
 
         // Standard SDK doesn't have aygshell.dll: see
         // include/wx/msw/wince/libraries.h

-#if defined(__WXWINCE__) && !defined(WCE_PLATFORM_STANDARDSDK)
+#if defined(__WXWINCE__) && !defined(__WINCE_STANDARDSDK__) && !defined(__HANDHELDPC__)

         SHINITDLGINFO shidi;
         shidi.dwMask = SHIDIM_FLAGS;
         SHINITDLGINFO shidi;
         shidi.dwMask = SHIDIM_FLAGS;

-        shidi.dwFlags = SHIDIF_DONEBUTTON |
-                        SHIDIF_SIZEDLGFULLSCREEN;
+        shidi.dwFlags = SHIDIF_SIZEDLGFULLSCREEN
+#ifndef __SMARTPHONE__
+                        | SHIDIF_DONEBUTTON
+#endif
+                        ;

         shidi.hDlg = hDlg;
         SHInitDialog( &shidi );
 #else // no SHInitDialog()
         shidi.hDlg = hDlg;
         SHInitDialog( &shidi );
 #else // no SHInitDialog()


@@ -984,7 +1058,7 @@ bool wxTLWHiddenParentModule::OnInit()
     ms_hwnd = NULL;
     ms_className = NULL;
 
     ms_hwnd = NULL;
     ms_className = NULL;
 

-    return TRUE;
+    return true;

 }
 
 void wxTLWHiddenParentModule::OnExit()
 }
 
 void wxTLWHiddenParentModule::OnExit()