1. Pause()/Resume() implemented for wxMSW

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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index a45bf2ea6b2ae92b0c388cfd7ab07d8700ae0691..8f1e6f9db3593540942938492f89c38e85631186 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -40,7 +40,7 @@
 #undef LoadAccelerators
 #endif
 
 #undef LoadAccelerators
 #endif
 

-#if USE_NATIVE_STATUSBAR
+#if wxUSE_NATIVE_STATUSBAR

 #include <wx/msw/statbr95.h>
 #endif
 
 #include <wx/msw/statbr95.h>
 #endif
 


@@ -62,7 +62,7 @@ END_EVENT_TABLE()
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
 #endif
 

-#if USE_NATIVE_STATUSBAR
+#if wxUSE_NATIVE_STATUSBAR

 bool wxFrame::m_useNativeStatusBar = TRUE;
 #else
 bool wxFrame::m_useNativeStatusBar = FALSE;
 bool wxFrame::m_useNativeStatusBar = TRUE;
 #else
 bool wxFrame::m_useNativeStatusBar = FALSE;


@@ -331,6 +331,12 @@ bool wxFrame::IsIconized(void) const
   return m_iconized;
 }
 
   return m_iconized;
 }
 

+// Is it maximized?
+bool wxFrame::IsMaximized(void) const
+{
+    return (::IsZoomed((HWND) GetHWND()) != 0) ;
+}
+

 void wxFrame::SetTitle(const wxString& title)
 {
   SetWindowText((HWND) GetHWND(), (const char *)title);
 void wxFrame::SetTitle(const wxString& title)
 {
   SetWindowText((HWND) GetHWND(), (const char *)title);


@@ -357,7 +363,7 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
 {
     wxStatusBar *statusBar = NULL;
 
 {
     wxStatusBar *statusBar = NULL;
 

-#if USE_NATIVE_STATUSBAR
+#if wxUSE_NATIVE_STATUSBAR

     if (UsesNativeStatusBar())
     {
         statusBar = new wxStatusBar95(this, id, style);
     if (UsesNativeStatusBar())
     {
         statusBar = new wxStatusBar95(this, id, style);


@@ -370,7 +376,7 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
 
         // Set the height according to the font and the border size
         wxClientDC dc(statusBar);
 
         // Set the height according to the font and the border size
         wxClientDC dc(statusBar);

-        dc.SetFont(* statusBar->GetFont());
+        dc.SetFont(statusBar->GetFont());

 
         long x, y;
         dc.GetTextExtent("X", &x, &y);
 
         long x, y;
         dc.GetTextExtent("X", &x, &y);


@@ -421,7 +427,7 @@ void wxFrame::PositionStatusBar(void)
 {
   // native status bar positions itself
   if (m_frameStatusBar
 {
   // native status bar positions itself
   if (m_frameStatusBar

-#if USE_NATIVE_STATUSBAR
+#if wxUSE_NATIVE_STATUSBAR

    && !m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95))
 #endif
     )
    && !m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95))
 #endif
     )


@@ -508,7 +514,7 @@ bool wxFrame::LoadAccelerators(const wxString& table)
 void wxFrame::Fit(void)
 {
   // Work out max. size
 void wxFrame::Fit(void)
 {
   // Work out max. size

-  wxNode *node = GetChildren()->First();
+  wxNode *node = GetChildren().First();

   int max_width = 0;
   int max_height = 0;
   while (node)
   int max_width = 0;
   int max_height = 0;
   while (node)


@@ -544,7 +550,7 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
     {
         wxSysColourChangedEvent event2;
         event2.SetEventObject( m_frameStatusBar );
     {
         wxSysColourChangedEvent event2;
         event2.SetEventObject( m_frameStatusBar );

-        m_frameStatusBar->ProcessEvent(event2);
+        m_frameStatusBar->GetEventHandler()->ProcessEvent(event2);

     }
 
     // Propagate the event to the non-top-level children
     }
 
     // Propagate the event to the non-top-level children


@@ -590,7 +596,7 @@ void wxFrame::MSWCreate(int id, wxWindow *parent, const char *wclass, wxWindow *
 
   // Keep this in wxFrame because it saves recoding this function
   // in wxTinyFrame
 
   // Keep this in wxFrame because it saves recoding this function
   // in wxTinyFrame

-#if USE_ITSY_BITSY
+#if wxUSE_ITSY_BITSY

   if (style & wxTINY_CAPTION_VERT)
     msflags |= IBS_VERTCAPTION;
   if (style & wxTINY_CAPTION_HORIZ)
   if (style & wxTINY_CAPTION_VERT)
     msflags |= IBS_VERTCAPTION;
   if (style & wxTINY_CAPTION_HORIZ)


@@ -606,6 +612,11 @@ void wxFrame::MSWCreate(int id, wxWindow *parent, const char *wclass, wxWindow *
 
   WXDWORD extendedStyle = MakeExtendedStyle(style);
 
 
   WXDWORD extendedStyle = MakeExtendedStyle(style);
 

+#ifndef __WIN16__
+  if (style & wxFRAME_TOOL_WINDOW)
+    extendedStyle |= WS_EX_TOOLWINDOW;
+#endif
+

   if (style & wxSTAY_ON_TOP)
     extendedStyle |= WS_EX_TOPMOST;
 
   if (style & wxSTAY_ON_TOP)
     extendedStyle |= WS_EX_TOPMOST;
 


@@ -620,18 +631,15 @@ void wxFrame::MSWCreate(int id, wxWindow *parent, const char *wclass, wxWindow *
 
 bool wxFrame::MSWOnPaint(void)
 {
 
 bool wxFrame::MSWOnPaint(void)
 {

-#if WXDEBUG > 1
-  wxDebugMsg("wxFrameWnd::OnPaint %d\n", handle);
-#endif

   RECT rect;
   if (GetUpdateRect((HWND) GetHWND(), &rect, FALSE))
   {
     if (m_iconized)
     {
       HICON the_icon;
   RECT rect;
   if (GetUpdateRect((HWND) GetHWND(), &rect, FALSE))
   {
     if (m_iconized)
     {
       HICON the_icon;

-    if (m_icon.Ok())
-      the_icon = (HICON) m_icon.GetHICON();
-      if (the_icon == 0)
+      if (m_icon.Ok())
+        the_icon = (HICON) m_icon.GetHICON();
+      else

         the_icon = (HICON) m_defaultIcon;
 
       PAINTSTRUCT ps;
         the_icon = (HICON) m_defaultIcon;
 
       PAINTSTRUCT ps;


@@ -677,9 +685,6 @@ WXHICON wxFrame::MSWOnQueryDragIcon(void)
 
 void wxFrame::MSWOnSize(int x, int y, WXUINT id)
 {
 
 void wxFrame::MSWOnSize(int x, int y, WXUINT id)
 {

-#if WXDEBUG > 1
-  wxDebugMsg("wxFrameWnd::OnSize %d\n", m_hWnd);
-#endif

   switch (id)
   {
     case SIZENORMAL:
   switch (id)
   {
     case SIZENORMAL:


@@ -709,7 +714,7 @@ void wxFrame::MSWOnSize(int x, int y, WXUINT id)
  if (!m_iconized)
  {
   // forward WM_SIZE to status bar control
  if (!m_iconized)
  {
   // forward WM_SIZE to status bar control

-#if USE_NATIVE_STATUSBAR
+#if wxUSE_NATIVE_STATUSBAR

   if (m_frameStatusBar && m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95)))
   {
     wxSizeEvent event(wxSize(x, y), m_frameStatusBar->GetId());
   if (m_frameStatusBar && m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95)))
   {
     wxSizeEvent event(wxSize(x, y), m_frameStatusBar->GetId());


@@ -731,17 +736,11 @@ void wxFrame::MSWOnSize(int x, int y, WXUINT id)
 
 bool wxFrame::MSWOnClose(void)
 {
 
 bool wxFrame::MSWOnClose(void)
 {

-#if WXDEBUG > 1
-  wxDebugMsg("wxFrameWnd::OnClose %d\n", handle);
-#endif

     return Close();
 }
 
 bool wxFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
 {
     return Close();
 }
 
 bool wxFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
 {

-#if WXDEBUG > 1
-  wxDebugMsg("wxFrameWnd::OnCommand %d\n", handle);
-#endif

   if (cmd == 0 || cmd == 1 ) // Can be either a menu command or an accelerator.
   {
     // In case it's e.g. a toolbar.
   if (cmd == 0 || cmd == 1 ) // Can be either a menu command or an accelerator.
   {
     // In case it's e.g. a toolbar.


@@ -804,7 +803,7 @@ bool wxFrame::MSWTranslateMessage(WXMSG* pMsg)
 void wxFrame::OnSize(wxSizeEvent& event)
 {
   // if we're using constraints - do use them
 void wxFrame::OnSize(wxSizeEvent& event)
 {
   // if we're using constraints - do use them

-  #if USE_CONSTRAINTS
+  #if wxUSE_CONSTRAINTS

     if ( GetAutoLayout() ) {
       Layout();
       return;
     if ( GetAutoLayout() ) {
       Layout();
       return;


@@ -813,7 +812,7 @@ void wxFrame::OnSize(wxSizeEvent& event)
 
   // do we have _exactly_ one child?
   wxWindow *child = NULL;
 
   // do we have _exactly_ one child?
   wxWindow *child = NULL;

-  for ( wxNode *node = GetChildren()->First(); node; node = node->Next() )
+  for ( wxNode *node = GetChildren().First(); node; node = node->Next() )

   {
     wxWindow *win = (wxWindow *)node->Data();
     if ( !win->IsKindOf(CLASSINFO(wxFrame))  &&
   {
     wxWindow *win = (wxWindow *)node->Data();
     if ( !win->IsKindOf(CLASSINFO(wxFrame))  &&


@@ -843,16 +842,13 @@ void wxFrame::OnSize(wxSizeEvent& event)
 // subwindow found.
 void wxFrame::OnActivate(wxActivateEvent& event)
 {
 // subwindow found.
 void wxFrame::OnActivate(wxActivateEvent& event)
 {

-  for(wxNode *node = GetChildren()->First(); node; node = node->Next())
+  for(wxNode *node = GetChildren().First(); node; node = node->Next())

   {
     // Find a child that's a subwindow, but not a dialog box.
     wxWindow *child = (wxWindow *)node->Data();
     if (!child->IsKindOf(CLASSINFO(wxFrame)) &&
          !child->IsKindOf(CLASSINFO(wxDialog)))
     {
   {
     // Find a child that's a subwindow, but not a dialog box.
     wxWindow *child = (wxWindow *)node->Data();
     if (!child->IsKindOf(CLASSINFO(wxFrame)) &&
          !child->IsKindOf(CLASSINFO(wxDialog)))
     {

-#if WXDEBUG > 1
-      wxDebugMsg("wxFrame::OnActivate: about to set the child's focus.\n");
-#endif

       child->SetFocus();
       return;
     }
       child->SetFocus();
       return;
     }


@@ -869,6 +865,8 @@ void wxFrame::OnCloseWindow(wxCloseEvent& event)
     {
         this->Destroy();
     }
     {
         this->Destroy();
     }

+    else
+        event.Veto(TRUE);

 }
 
 bool wxFrame::OnClose(void)
 }
 
 bool wxFrame::OnClose(void)


@@ -933,7 +931,7 @@ void wxFrame::Command(int id)
 
 void wxFrame::ProcessCommand(int id)
 {
 
 void wxFrame::ProcessCommand(int id)
 {

-  wxCommandEvent commandEvent(wxEVENT_TYPE_MENU_COMMAND, id);
+  wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);

   commandEvent.SetInt( id );
   commandEvent.SetEventObject( this );
 
   commandEvent.SetInt( id );
   commandEvent.SetEventObject( this );
 


@@ -970,6 +968,30 @@ wxPoint wxFrame::GetClientAreaOrigin() const
     return pt;
 }
 
     return pt;
 }
 

+void wxFrame::ScreenToClient(int *x, int *y) const
+{
+    wxWindow::ScreenToClient(x, y);
+
+    // We may be faking the client origin.
+    // So a window that's really at (0, 30) may appear
+    // (to wxWin apps) to be at (0, 0).
+    wxPoint pt(GetClientAreaOrigin());
+    *x -= pt.x;
+    *y -= pt.y;
+}
+
+void wxFrame::ClientToScreen(int *x, int *y) const
+{
+    // We may be faking the client origin.
+    // So a window that's really at (0, 30) may appear
+    // (to wxWin apps) to be at (0, 0).
+    wxPoint pt1(GetClientAreaOrigin());
+    *x += pt1.x;
+    *y += pt1.y;
+
+    wxWindow::ClientToScreen(x, y);
+}
+

 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {
     wxCHECK_MSG( m_frameToolBar == NULL, FALSE,
 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {
     wxCHECK_MSG( m_frameToolBar == NULL, FALSE,


@@ -1026,8 +1048,7 @@ void wxFrame::PositionToolBar(void)
 // propagate our state change to all child frames
 void wxFrame::IconizeChildFrames(bool bIconize)
 {
 // propagate our state change to all child frames
 void wxFrame::IconizeChildFrames(bool bIconize)
 {

-  wxWindow *child = NULL;
-  for ( wxNode *node = GetChildren()->First(); node; node = node->Next() ) {
+  for ( wxNode *node = GetChildren().First(); node; node = node->Next() ) {

     wxWindow *win = (wxWindow *)node->Data();
     if ( win->IsKindOf(CLASSINFO(wxFrame)) ) {
       ((wxFrame *)win)->Iconize(bIconize);
     wxWindow *win = (wxWindow *)node->Data();
     if ( win->IsKindOf(CLASSINFO(wxFrame)) ) {
       ((wxFrame *)win)->Iconize(bIconize);