many fixes to wxTextCrtl, wxTreeCrtl, wxListBox,

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

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 437f46b068519554b28a464a575b79a4ab50f80b..c156a76dc9276c41ba359b2529ff3fa48edc0ca8 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -121,7 +121,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
 
   m_windowMenu = (WXHMENU) ::LoadMenu(wxGetInstance(), "wxWindowMenu");
 
 
   m_windowMenu = (WXHMENU) ::LoadMenu(wxGetInstance(), "wxWindowMenu");
 

-#if DEBUG > 1
+#if WXDEBUG > 1

   wxDebugMsg("Loaded m_windowMenu %d\n", m_windowMenu);
 #endif
 
   wxDebugMsg("Loaded m_windowMenu %d\n", m_windowMenu);
 #endif
 


@@ -431,7 +431,7 @@ bool wxMDIParentFrame::MSWOnDestroy(void)
 
 void wxMDIParentFrame::MSWOnCreate(WXLPCREATESTRUCT WXUNUSED(cs))
 {
 
 void wxMDIParentFrame::MSWOnCreate(WXLPCREATESTRUCT WXUNUSED(cs))
 {

-       m_clientWindow = new wxMDIClientWindow;
+       m_clientWindow = OnCreateClient();

        // Uses own style for client style
        m_clientWindow->CreateClient(this, GetWindowStyleFlag());
 }
        // Uses own style for client style
        m_clientWindow->CreateClient(this, GetWindowStyleFlag());
 }


@@ -514,7 +514,7 @@ bool wxMDIParentFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
      }
     if (id >= 0xF000)
     {
      }
     if (id >= 0xF000)
     {

-#if DEBUG > 1
+#if WXDEBUG > 1

       wxDebugMsg("wxMDIFrame::OnCommand %d: system command: calling default window proc\n", GetHWND());
 #endif
       return FALSE; // Get WndProc to call default proc
       wxDebugMsg("wxMDIFrame::OnCommand %d: system command: calling default window proc\n", GetHWND());
 #endif
       return FALSE; // Get WndProc to call default proc


@@ -527,7 +527,7 @@ bool wxMDIParentFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
     }
     else if (m_currentChild && (id < wxFIRST_MDI_CHILD || id > wxLAST_MDI_CHILD))
     {
     }
     else if (m_currentChild && (id < wxFIRST_MDI_CHILD || id > wxLAST_MDI_CHILD))
     {

-#if DEBUG > 1
+#if WXDEBUG > 1

       wxDebugMsg("wxMDIFrame::MSWOnCommand %d: calling child OnCommand\n", GetHWND());
 #endif
       return m_currentChild->MSWOnCommand(id, cmd, control);
       wxDebugMsg("wxMDIFrame::MSWOnCommand %d: calling child OnCommand\n", GetHWND());
 #endif
       return m_currentChild->MSWOnCommand(id, cmd, control);


@@ -609,7 +609,7 @@ bool wxMDIParentFrame::MSWProcessMessage(WXMSG* msg)
      return TRUE;
        
   if (m_acceleratorTable != (WXHANDLE) NULL &&
      return TRUE;
        
   if (m_acceleratorTable != (WXHANDLE) NULL &&

-          ::TranslateAccelerator((HWND) GetHWND(), (HANDLE) m_acceleratorTable, pMsg))
+          ::TranslateAccelerator((HWND) GetHWND(), (HACCEL) m_acceleratorTable, pMsg))

     return TRUE;
 
   if (pMsg->message == WM_KEYDOWN || pMsg->message == WM_SYSKEYDOWN)
     return TRUE;
 
   if (pMsg->message == WM_KEYDOWN || pMsg->message == WM_SYSKEYDOWN)


@@ -818,7 +818,7 @@ void wxMDIChildFrame::SetMenuBar(wxMenuBar *menu_bar)
    wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
 
    parent->m_parentFrameActive = FALSE;
    wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
 
    parent->m_parentFrameActive = FALSE;

-   HMENU subMenu = GetSubMenu((HWND) parent->GetWindowMenu(), 0);
+   HMENU subMenu = GetSubMenu((HMENU) parent->GetWindowMenu(), 0);

 
    // Try to insert Window menu in front of Help, otherwise append it.
    int N = GetMenuItemCount(menu);
 
    // Try to insert Window menu in front of Help, otherwise append it.
    int N = GetMenuItemCount(menu);


@@ -883,7 +883,7 @@ void wxMDIChildFrame::MSWOnSize(int x, int y, WXUINT id)
 
   if (invalidHandle == (HWND) GetHWND())
   {
 
   if (invalidHandle == (HWND) GetHWND())
   {

-#if DEBUG > 1
+#if WXDEBUG > 1

   wxDebugMsg("wxMDIChildFrame::OnSize %d: invalid, so returning.\n", GetHWND());
 #endif
     return;
   wxDebugMsg("wxMDIChildFrame::OnSize %d: invalid, so returning.\n", GetHWND());
 #endif
     return;


@@ -923,7 +923,7 @@ void wxMDIChildFrame::MSWOnSize(int x, int y, WXUINT id)
 
 bool wxMDIChildFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
 {
 
 bool wxMDIChildFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)
 {

-#if DEBUG > 1
+#if WXDEBUG > 1

   wxDebugMsg("wxMDIChildFrame::MSWOnCommand %d\n", GetHWND());
 #endif
   if ((cmd == 0) && GetHWND())
   wxDebugMsg("wxMDIChildFrame::MSWOnCommand %d\n", GetHWND());
 #endif
   if ((cmd == 0) && GetHWND())


@@ -960,7 +960,7 @@ bool wxMDIChildFrame::MSWProcessMessage(WXMSG *msg)
   {
     wxFrame *parent = (wxFrame *)GetParent();
     HWND parent_hwnd = (HWND) parent->GetHWND();
   {
     wxFrame *parent = (wxFrame *)GetParent();
     HWND parent_hwnd = (HWND) parent->GetHWND();

-    return (::TranslateAccelerator(parent_hwnd, (HANDLE) m_acceleratorTable, pMsg) != 0);
+    return (::TranslateAccelerator(parent_hwnd, (HACCEL) m_acceleratorTable, pMsg) != 0);

   }
   return FALSE;
 }
   }
   return FALSE;
 }


@@ -969,11 +969,11 @@ long wxMDIChildFrame::MSWOnMDIActivate(long activate, WXHWND WXUNUSED(one), WXHW
 {
   wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
   HMENU parent_menu = (HMENU) parent->GetWinMenu();
 {
   wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
   HMENU parent_menu = (HMENU) parent->GetWinMenu();

-#if DEBUG > 1
+#if WXDEBUG > 1

   wxDebugMsg("Parent menu is %d\n", parent_menu);
 #endif
   HMENU child_menu = (HMENU) GetWinMenu();
   wxDebugMsg("Parent menu is %d\n", parent_menu);
 #endif
   HMENU child_menu = (HMENU) GetWinMenu();

-#if DEBUG > 1
+#if WXDEBUG > 1

   wxDebugMsg("Child menu is %d\n", child_menu);
 #endif
 
   wxDebugMsg("Child menu is %d\n", child_menu);
 #endif
 


@@ -985,7 +985,7 @@ long wxMDIChildFrame::MSWOnMDIActivate(long activate, WXHWND WXUNUSED(one), WXHW
     {
       parent->m_parentFrameActive = FALSE;
       HMENU subMenu = GetSubMenu((HMENU) parent->GetWindowMenu(), 0);
     {
       parent->m_parentFrameActive = FALSE;
       HMENU subMenu = GetSubMenu((HMENU) parent->GetWindowMenu(), 0);

-#if DEBUG > 1
+#if WXDEBUG > 1

       wxDebugMsg("Window submenu is %d\n", subMenu);
 #endif
 //      HMENU subMenu = 0;
       wxDebugMsg("Window submenu is %d\n", subMenu);
 #endif
 //      HMENU subMenu = 0;


@@ -1018,7 +1018,7 @@ long wxMDIChildFrame::MSWOnMDIActivate(long activate, WXHWND WXUNUSED(one), WXHW
     {
       parent->m_parentFrameActive = TRUE;
       HMENU subMenu = GetSubMenu((HMENU) parent->GetWindowMenu(), 0);
     {
       parent->m_parentFrameActive = TRUE;
       HMENU subMenu = GetSubMenu((HMENU) parent->GetWindowMenu(), 0);

-#if DEBUG > 1
+#if WXDEBUG > 1

       wxDebugMsg("Window submenu is %d\n", subMenu);
 #endif
 //      HMENU subMenu = 0;
       wxDebugMsg("Window submenu is %d\n", subMenu);
 #endif
 //      HMENU subMenu = 0;


@@ -1039,7 +1039,7 @@ long wxMDIChildFrame::MSWOnMDIActivate(long activate, WXHWND WXUNUSED(one), WXHW
   event.SetEventObject( this );
   GetEventHandler()->ProcessEvent(event);
 
   event.SetEventObject( this );
   GetEventHandler()->ProcessEvent(event);
 

-#if DEBUG > 1
+#if WXDEBUG > 1

   wxDebugMsg("Finished (de)activating\n");
 #endif
   return 0;
   wxDebugMsg("Finished (de)activating\n");
 #endif
   return 0;


@@ -1058,7 +1058,7 @@ void wxMDIChildFrame::MSWDestroyWindow(void)
   // destroyed.
 
   HWND oldHandle = (HWND)GetHWND();
   // destroyed.
 
   HWND oldHandle = (HWND)GetHWND();

-#if DEBUG > 1
+#if WXDEBUG > 1

   wxDebugMsg("*** About to DestroyWindow MDI child %d\n", oldHandle);
 #endif
 #ifdef __WIN32__
   wxDebugMsg("*** About to DestroyWindow MDI child %d\n", oldHandle);
 #endif
 #ifdef __WIN32__


@@ -1066,7 +1066,7 @@ void wxMDIChildFrame::MSWDestroyWindow(void)
 #else
   SendMessage((HWND) parent->GetClientWindow()->GetHWND(), WM_MDIDESTROY, (HWND)oldHandle, 0);
 #endif
 #else
   SendMessage((HWND) parent->GetClientWindow()->GetHWND(), WM_MDIDESTROY, (HWND)oldHandle, 0);
 #endif

-#if DEBUG > 1
+#if WXDEBUG > 1

   wxDebugMsg("*** Finished DestroyWindow MDI child %d\n", oldHandle);
 #endif
   invalidHandle = 0;
   wxDebugMsg("*** Finished DestroyWindow MDI child %d\n", oldHandle);
 #endif
   invalidHandle = 0;