1. new wxList code

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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index a4c8b0b9021861f92fbabb96efc44fb094520fac..0f5da8a297eb42096a887377401a2712bcd77703 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -33,19 +33,21 @@
 
 #include "wx/msw/private.h"
 #include "wx/statusbr.h"
 
 #include "wx/msw/private.h"
 #include "wx/statusbr.h"

+#include "wx/toolbar.h"

 #include "wx/menuitem.h"
 
 #ifdef LoadAccelerators
 #undef LoadAccelerators
 #endif
 
 #include "wx/menuitem.h"
 
 #ifdef LoadAccelerators
 #undef LoadAccelerators
 #endif
 

-#if USE_NATIVE_STATUSBAR
+#if wxUSE_NATIVE_STATUSBAR

 #include <wx/msw/statbr95.h>
 #endif
 
 extern wxList wxModelessWindows;
 extern wxList wxPendingDelete;
 extern char wxFrameClassName[];
 #include <wx/msw/statbr95.h>
 #endif
 
 extern wxList wxModelessWindows;
 extern wxList wxPendingDelete;
 extern char wxFrameClassName[];

+extern wxMenu *wxCurrentPopupMenu;

 
 #if !USE_SHARED_LIBRARY
 BEGIN_EVENT_TABLE(wxFrame, wxWindow)
 
 #if !USE_SHARED_LIBRARY
 BEGIN_EVENT_TABLE(wxFrame, wxWindow)


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


@@ -110,8 +112,11 @@ bool wxFrame::Create(wxWindow *parent,
   int height = size.y;
 
   m_iconized = FALSE;
   int height = size.y;
 
   m_iconized = FALSE;

-  MSWCreate(m_windowId, (wxWindow *)parent, wxFrameClassName, this, (char *)(const char *)title,
-                   x, y, width, height, style);
+
+  // we pass NULL as parent to MSWCreate because frames with parents behave
+  // very strangely under Win95 shell
+  MSWCreate(m_windowId, NULL, wxFrameClassName, this, title,
+            x, y, width, height, style);

 
   wxModelessWindows.Append(this);
   return TRUE;
 
   wxModelessWindows.Append(this);
   return TRUE;


@@ -154,19 +159,23 @@ WXHMENU wxFrame::GetWinMenu(void) const
   return m_hMenu;
 }
 
   return m_hMenu;
 }
 

-// Get size *available for subwindows* i.e. excluding menu bar etc.
-// For XView, this is the same as GetSize
+// Get size *available for subwindows* i.e. excluding menu bar, toolbar etc.

 void wxFrame::GetClientSize(int *x, int *y) const
 {
   RECT rect;
   GetClientRect((HWND) GetHWND(), &rect);
 
 void wxFrame::GetClientSize(int *x, int *y) const
 {
   RECT rect;
   GetClientRect((HWND) GetHWND(), &rect);
 

-  if ( m_frameStatusBar )
+  if ( GetStatusBar() )

   {
   {

-  int statusX, statusY;
-  m_frameStatusBar->GetClientSize(&statusX, &statusY);
-  rect.bottom -= statusY;
+    int statusX, statusY;
+    GetStatusBar()->GetClientSize(&statusX, &statusY);
+    rect.bottom -= statusY;

   }
   }

+
+  wxPoint pt(GetClientAreaOrigin());
+  rect.bottom -= pt.y;
+  rect.right -= pt.x;
+

   *x = rect.right;
   *y = rect.bottom;
 }
   *x = rect.right;
   *y = rect.bottom;
 }


@@ -189,13 +198,17 @@ void wxFrame::SetClientSize(int width, int height)
   int actual_width = rect2.right - rect2.left - rect.right + width;
   int actual_height = rect2.bottom - rect2.top - rect.bottom + height;
 
   int actual_width = rect2.right - rect2.left - rect.right + width;
   int actual_height = rect2.bottom - rect2.top - rect.bottom + height;
 

-  if ( m_frameStatusBar )
+  if ( GetStatusBar() )

   {
   {

-  int statusX, statusY;
-  m_frameStatusBar->GetClientSize(&statusX, &statusY);
-  actual_height += statusY;
+    int statusX, statusY;
+    GetStatusBar()->GetClientSize(&statusX, &statusY);
+    actual_height += statusY;

   }
 
   }
 

+  wxPoint pt(GetClientAreaOrigin());
+  actual_width += pt.y;
+  actual_height += pt.x;
+

   POINT point;
   point.x = rect2.left;
   point.y = rect2.top;
   POINT point;
   point.x = rect2.left;
   point.y = rect2.top;


@@ -339,19 +352,21 @@ void wxFrame::SetIcon(const wxIcon& icon)
 #endif
 }
 
 #endif
 }
 

-wxStatusBar *wxFrame::OnCreateStatusBar(int number)
+wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
+    const wxString& name)

 {
     wxStatusBar *statusBar = NULL;
 
 {
     wxStatusBar *statusBar = NULL;
 

-#if USE_NATIVE_STATUSBAR
+#if wxUSE_NATIVE_STATUSBAR

     if (UsesNativeStatusBar())
     {
     if (UsesNativeStatusBar())
     {

-        statusBar = new wxStatusBar95(this);
+        statusBar = new wxStatusBar95(this, id, style);

     }
     else
 #endif
     {
     }
     else
 #endif
     {

-        statusBar = new wxStatusBar(this, -1, wxPoint(0, 0), wxSize(100, 20));
+        statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 20),
+            style, name);

 
         // 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);


@@ -369,20 +384,22 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number)
   return statusBar;
 }
 
   return statusBar;
 }
 

-bool wxFrame::CreateStatusBar(int number)
+wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id,
+    const wxString& name)

 {
   // VZ: calling CreateStatusBar twice is an error - why anyone would do it?
   wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, 
                "recreating status bar in wxFrame" );
 
 {
   // VZ: calling CreateStatusBar twice is an error - why anyone would do it?
   wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, 
                "recreating status bar in wxFrame" );
 

-  m_frameStatusBar = OnCreateStatusBar(number);
+  m_frameStatusBar = OnCreateStatusBar(number, style, id,
+    name);

   if ( m_frameStatusBar )
   {
     PositionStatusBar();
   if ( m_frameStatusBar )
   {
     PositionStatusBar();

-    return TRUE;
+    return m_frameStatusBar;

   }
   else
   }
   else

-    return FALSE;
+    return NULL;

 }
 
 void wxFrame::SetStatusText(const wxString& text, int number)
 }
 
 void wxFrame::SetStatusText(const wxString& text, int number)


@@ -404,7 +421,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
     )


@@ -413,6 +430,9 @@ void wxFrame::PositionStatusBar(void)
       GetClientSize(&w, &h);
       int sw, sh;
       m_frameStatusBar->GetSize(&sw, &sh);
       GetClientSize(&w, &h);
       int sw, sh;
       m_frameStatusBar->GetSize(&sw, &sh);

+
+      // Since we wish the status bar to be directly under the client area,
+      // we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS.

       m_frameStatusBar->SetSize(0, h, w, sh);
   }
 }
       m_frameStatusBar->SetSize(0, h, w, sh);
   }
 }


@@ -463,6 +483,7 @@ void wxFrame::SetMenuBar(wxMenuBar *menu_bar)
   menu_bar->m_menuBarFrame = this;
 }
 
   menu_bar->m_menuBarFrame = this;
 }
 

+#if 0

 bool wxFrame::LoadAccelerators(const wxString& table)
 {
   m_acceleratorTable = (WXHANDLE)
 bool wxFrame::LoadAccelerators(const wxString& table)
 {
   m_acceleratorTable = (WXHANDLE)


@@ -482,6 +503,7 @@ bool wxFrame::LoadAccelerators(const wxString& table)
 
   return (m_acceleratorTable != (WXHANDLE) NULL);
 }
 
   return (m_acceleratorTable != (WXHANDLE) NULL);
 }

+#endif

 
 void wxFrame::Fit(void)
 {
 
 void wxFrame::Fit(void)
 {


@@ -522,7 +544,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


@@ -568,7 +590,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)


@@ -598,18 +620,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;


@@ -655,24 +674,36 @@ 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)
   {
   switch (id)
   {

-    case SIZEFULLSCREEN:

     case SIZENORMAL:
     case SIZENORMAL:

+      // only do it it if we were iconized before, otherwise resizing the
+      // parent frame has a curious side effect of bringing it under it's
+      // children
+      if ( !m_iconized )
+        break;
+
+      // restore all child frames too
+      IconizeChildFrames(FALSE);
+
+      // fall through
+
+    case SIZEFULLSCREEN:

       m_iconized = FALSE;
       m_iconized = FALSE;

-    break;
+      break;
+

     case SIZEICONIC:
     case SIZEICONIC:

+      // iconize all child frames too
+      IconizeChildFrames(TRUE);
+

       m_iconized = TRUE;
       m_iconized = TRUE;

-    break;
+      break;

   }
 
  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());


@@ -683,6 +714,8 @@ void wxFrame::MSWOnSize(int x, int y, WXUINT id)
 #endif
 
   PositionStatusBar();
 #endif
 
   PositionStatusBar();

+  PositionToolBar();
+

   wxSizeEvent event(wxSize(x, y), m_windowId);
   event.SetEventObject( this );
   if (!GetEventHandler()->ProcessEvent(event))
   wxSizeEvent event(wxSize(x, y), m_windowId);
   event.SetEventObject( this );
   if (!GetEventHandler()->ProcessEvent(event))


@@ -692,17 +725,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.


@@ -710,6 +737,14 @@ bool wxFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
     if (win)
       return win->MSWCommand(cmd, id);
 
     if (win)
       return win->MSWCommand(cmd, id);
 

+    if (wxCurrentPopupMenu)
+    {
+        wxMenu *popupMenu = wxCurrentPopupMenu;
+        wxCurrentPopupMenu = NULL;
+        if (popupMenu->MSWCommand(cmd, id))
+            return TRUE;
+    }
+

     if (GetMenuBar() && GetMenuBar()->FindItemForId(id))
     {
       ProcessCommand(id);
     if (GetMenuBar() && GetMenuBar()->FindItemForId(id))
     {
       ProcessCommand(id);


@@ -740,8 +775,13 @@ void wxFrame::MSWOnMenuHighlight(WXWORD nItem, WXWORD nFlags, WXHMENU hSysMenu)
 
 bool wxFrame::MSWProcessMessage(WXMSG* pMsg)
 {
 
 bool wxFrame::MSWProcessMessage(WXMSG* pMsg)
 {

-  if (m_acceleratorTable != 0 &&
-          ::TranslateAccelerator((HWND) GetHWND(), (HACCEL) m_acceleratorTable, (MSG *)pMsg))
+  return FALSE;
+}
+
+bool wxFrame::MSWTranslateMessage(WXMSG* pMsg)
+{
+  if (m_acceleratorTable.Ok() &&
+          ::TranslateAccelerator((HWND) GetHWND(), (HACCEL) m_acceleratorTable.GetHACCEL(), (MSG *)pMsg))

     return TRUE;
   
   return FALSE;
     return TRUE;
   
   return FALSE;


@@ -752,7 +792,7 @@ bool wxFrame::MSWProcessMessage(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;


@@ -783,16 +823,6 @@ void wxFrame::OnSize(wxSizeEvent& event)
     int x = 0;
     int y = 0;
 
     int x = 0;
     int y = 0;
 

-    // Manage the toolbar if there is one
-    if ( GetToolBar() )
-    {
-        int wt, ht;
-        GetToolBar()->GetSize(&wt, &ht);
-        clientH -= ht;
-        y += ht;
-        GetToolBar()->SetSize(0, 0, clientW, ht);
-    }
-

     child->SetSize(x, y, clientW, clientH);
   }
 }
     child->SetSize(x, y, clientW, clientH);
   }
 }


@@ -808,9 +838,6 @@ void wxFrame::OnActivate(wxActivateEvent& event)
     if (!child->IsKindOf(CLASSINFO(wxFrame)) &&
          !child->IsKindOf(CLASSINFO(wxDialog)))
     {
     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;
     }


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

+    else
+        event.Veto(TRUE);

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


@@ -907,52 +936,112 @@ void wxFrame::ProcessCommand(int id)
   GetEventHandler()->ProcessEvent(commandEvent);
 }
 
   GetEventHandler()->ProcessEvent(commandEvent);
 }
 

-void wxFrame::OnIdle(wxIdleEvent& event)
+// Checks if there is a toolbar, and returns the first free client position
+wxPoint wxFrame::GetClientAreaOrigin() const

 {
 {

-  DoMenuUpdates();
+    wxPoint pt(0, 0);
+    if (GetToolBar())
+    {
+        int w, h;
+        GetToolBar()->GetSize(& w, & h);
+
+        if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
+        {
+            pt.x += w;
+        }
+        else
+        {
+            pt.y += h;
+        }
+    }
+    return pt;

 }
 
 }
 

-// Query app for menu item updates (called from OnIdle)
-void wxFrame::DoMenuUpdates(void)
+void wxFrame::ScreenToClient(int *x, int *y) const

 {
 {

-  wxMenuBar* bar = GetMenuBar();
-  if (!bar)
-    return;
+    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;
+}

 
 

-  int i;
-  for (i = 0; i < bar->m_menuCount; i++)
-  {
-    wxMenu* menu = bar->m_menus[i];
+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);
+}

 
 

-    DoMenuUpdates(menu);
-  }
+wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
+{
+    wxCHECK_MSG( m_frameToolBar == NULL, FALSE,
+               "recreating toolbar in wxFrame" );
+
+    wxToolBar* toolBar = OnCreateToolBar(style, id, name);
+    if (toolBar)
+    {
+        SetToolBar(toolBar);
+        PositionToolBar();
+        return toolBar;
+    }
+    else
+    {
+        return NULL;
+    }

 }
 
 }
 

-void wxFrame::DoMenuUpdates(wxMenu* menu)
+wxToolBar* wxFrame::OnCreateToolBar(long style, wxWindowID id, const wxString& name)

 {
 {

-  wxNode* node = menu->m_menuItems.First();
-  while (node)
-  {
-    wxMenuItem* item = (wxMenuItem*) node->Data();
-    if ( !item->IsSeparator() )
+    return new wxToolBar(this, id, wxDefaultPosition, wxDefaultSize, style, name);
+}
+
+void wxFrame::PositionToolBar(void)
+{
+    RECT rect;
+    ::GetClientRect((HWND) GetHWND(), &rect);
+
+    if ( GetStatusBar() )

     {
     {

-        wxWindowID id = item->GetId();
-      wxUpdateUIEvent event(id);
-      event.SetEventObject( this );
+      int statusX, statusY;
+      GetStatusBar()->GetClientSize(&statusX, &statusY);
+      rect.bottom -= statusY;
+    }

 
 

-      if (GetEventHandler()->ProcessEvent(event))
-      {
-        if (event.GetSetText())
-          menu->SetLabel(id, event.GetText());
-        if (event.GetSetChecked())
-          menu->Check(id, event.GetChecked());
-        if (event.GetSetEnabled())
-          menu->Enable(id, event.GetEnabled());
-      }
+    if (GetToolBar())
+    {
+        int tw, th;
+        GetToolBar()->GetSize(& tw, & th);
+
+        if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
+        {
+            // Use the 'real' MSW position
+            GetToolBar()->SetSize(0, 0, tw, rect.bottom, wxSIZE_NO_ADJUSTMENTS);
+        }
+        else
+        {
+            // Use the 'real' MSW position
+            GetToolBar()->SetSize(0, 0, rect.right, th, wxSIZE_NO_ADJUSTMENTS);
+        }
+    }
+}

 
 

-      if (item->GetSubMenu())
-        DoMenuUpdates(item->GetSubMenu());
+// propagate our state change to all child frames
+void wxFrame::IconizeChildFrames(bool bIconize)
+{
+  for ( wxNode *node = GetChildren()->First(); node; node = node->Next() ) {
+    wxWindow *win = (wxWindow *)node->Data();
+    if ( win->IsKindOf(CLASSINFO(wxFrame)) ) {
+      ((wxFrame *)win)->Iconize(bIconize);

     }
     }

-    node = node->Next();

   }
 }
   }
 }

+