Hardware defines spec.

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

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index c8966ad7bba727d0296c856c90d2c146bcdefaad..ae28587509cf625723a3533da5717bae6d9c304d 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -40,6 +40,7 @@
 #endif //WX_PRECOMP
 
 #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 "wx/msw/private.h"
 #if defined(__WXWINCE__) && !defined(__HANDHELDPC__)


@@ -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,13 +135,13 @@ 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;
 


@@ -342,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;


@@ -406,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__
 }
 


@@ -453,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);
 


@@ -511,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,


@@ -529,7 +530,6 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
 #endif
 
 #ifdef __SMARTPHONE__
 #endif
 
 #ifdef __SMARTPHONE__

-    SetLeftMenu(wxID_EXIT, _("Done"));

     SetRightMenu(); // to nothing for initialization
 #endif
 
     SetRightMenu(); // to nothing for initialization
 #endif
 


@@ -567,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 )


@@ -582,7 +582,7 @@ bool wxTopLevelWindowMSW::Show(bool show)
             DoShowWindow(SW_SHOW);
 #endif
 
             DoShowWindow(SW_SHOW);
 #endif
 

-            m_maximizeOnShow = FALSE;
+            m_maximizeOnShow = false;

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


@@ -610,7 +610,7 @@ bool wxTopLevelWindowMSW::Show(bool show)
     {
         ::BringWindowToTop(GetHwnd());
 
     {
         ::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);
     }


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

-    return TRUE;
+    return true;

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


@@ -650,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


@@ -664,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;


@@ -687,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;


@@ -787,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;

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


@@ -840,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


@@ -851,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


@@ -868,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


@@ -895,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 && (defined FLASHW_STOP))
+    // 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
 // ----------------------------------------------------------------------------


@@ -977,8 +1024,11 @@ wxDlgProc(HWND hDlg,
 #if defined(__WXWINCE__) && !defined(__WINCE_STANDARDSDK__) && !defined(__HANDHELDPC__)
         SHINITDLGINFO shidi;
         shidi.dwMask = SHIDIM_FLAGS;
 #if defined(__WXWINCE__) && !defined(__WINCE_STANDARDSDK__) && !defined(__HANDHELDPC__)
         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()


@@ -1008,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()