set string length to 0 in AllocBeforeWrite() just to be tidy (replaces patch 1123226)

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 4a466af0c5380f08ad9b8753d41d03b3cf9490a0..0cf5f9959cb7b9f2289a8145f9989c30590bf900 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -306,9 +306,9 @@ wxBEGIN_PROPERTIES_TABLE(wxWindow)
     wxPROPERTY( Shown , bool , Show , IsShown , wxxVariant((bool)true) , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
 #if 0
     // possible property candidates (not in xrc) or not valid in all subclasses
     wxPROPERTY( Shown , bool , Show , IsShown , wxxVariant((bool)true) , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
 #if 0
     // possible property candidates (not in xrc) or not valid in all subclasses

-    wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxT("") )
+    wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxEmptyString )

     wxPROPERTY( Font , wxFont , SetFont , GetWindowFont  , )
     wxPROPERTY( Font , wxFont , SetFont , GetWindowFont  , )

-    wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxT("") )
+    wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxEmptyString )

     // MaxHeight, Width , MinHeight , Width
     // TODO switch label to control and title to toplevels
 
     // MaxHeight, Width , MinHeight , Width
     // TODO switch label to control and title to toplevels
 


@@ -1146,8 +1146,9 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
 
     // using this flag results in very significant reduction in flicker,
     // especially with controls inside the static boxes (as the interior of the
 
     // using this flag results in very significant reduction in flicker,
     // especially with controls inside the static boxes (as the interior of the

-    // box is not redrawn twice)
-    if (!wxSystemOptions::GetOptionInt(wxT("msw.window.no-clip-children")) == 1)
+    // box is not redrawn twice).
+    // wxCLIP_CHILDREN support is for compatibility with old applications only.
+    if ((!wxSystemOptions::GetOptionInt(wxT("msw.window.no-clip-children")) == 1) || (flags & wxCLIP_CHILDREN))

         style |= WS_CLIPCHILDREN;
 
     // it doesn't seem useful to use WS_CLIPSIBLINGS here as we officially
         style |= WS_CLIPCHILDREN;
 
     // it doesn't seem useful to use WS_CLIPSIBLINGS here as we officially


@@ -1653,13 +1654,6 @@ void wxWindowMSW::DoSetClientSize(int width, int height)
     }
 }
 
     }
 }
 

-// For implementation purposes - sometimes decorations make the client area
-// smaller
-wxPoint wxWindowMSW::GetClientAreaOrigin() const
-{
-    return wxPoint(0, 0);
-}
-

 // ---------------------------------------------------------------------------
 // text metrics
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // text metrics
 // ---------------------------------------------------------------------------


@@ -1834,7 +1828,8 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg)
             }
 
             bool bForward = true,
             }
 
             bool bForward = true,

-                 bWindowChange = false;
+                 bWindowChange = false,
+                 bFromTab = false;

 
             // should we process this message specially?
             bool bProcess = true;
 
             // should we process this message specially?
             bool bProcess = true;


@@ -1848,6 +1843,7 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg)
                         // Ctrl-Tab cycles thru notebook pages
                         bWindowChange = bCtrlDown;
                         bForward = !bShiftDown;
                         // Ctrl-Tab cycles thru notebook pages
                         bWindowChange = bCtrlDown;
                         bForward = !bShiftDown;

+                        bFromTab = true;

                     }
                     break;
 
                     }
                     break;
 


@@ -1972,6 +1968,7 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg)
                 wxNavigationKeyEvent event;
                 event.SetDirection(bForward);
                 event.SetWindowChange(bWindowChange);
                 wxNavigationKeyEvent event;
                 event.SetDirection(bForward);
                 event.SetWindowChange(bWindowChange);

+                event.SetFromTab(bFromTab);

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


@@ -2317,23 +2314,26 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
                 break;
             }
 
                 break;
             }
 

-#ifndef __WXWINCE__
-        case WM_PRINT:
+#ifdef WM_PRINT
+        case WM_PRINTCLIENT:
+            if ( GetParent() &&
+                    GetParent()->MSWPrintChild(this, wParam, lParam) )

             {
             {

-#if wxUSE_LISTCTRL
-                // Don't call the wx handlers in this case
-                if ( wxIsKindOf(this, wxListCtrl) )
-                    break;
-#endif
+                processed = true;
+            }
+            break;

 
 

+        case WM_PRINT:
+            {

                 if ( lParam & PRF_ERASEBKGND )
                     HandleEraseBkgnd((WXHDC)(HDC)wParam);
 
                 wxPaintDCEx dc((wxWindow *)this, (WXHDC)wParam);
                 if ( lParam & PRF_ERASEBKGND )
                     HandleEraseBkgnd((WXHDC)(HDC)wParam);
 
                 wxPaintDCEx dc((wxWindow *)this, (WXHDC)wParam);

+

                 processed = HandlePaint();
             }
             break;
                 processed = HandlePaint();
             }
             break;

-#endif
+#endif // WM_PRINT

 
         case WM_CLOSE:
 #ifdef __WXUNIVERSAL__
 
         case WM_CLOSE:
 #ifdef __WXUNIVERSAL__


@@ -2788,7 +2788,7 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
                         wxHelpEvent helpEvent(wxEVT_HELP,
                                               subjectOfHelp->GetId(),
 #ifdef __WXWINCE__
                         wxHelpEvent helpEvent(wxEVT_HELP,
                                               subjectOfHelp->GetId(),
 #ifdef __WXWINCE__

-                                              wxPoint(0, 0)
+                                              wxPoint(0,0)

 #else
                                               wxPoint(info->MousePos.x, info->MousePos.y)
 #endif
 #else
                                               wxPoint(info->MousePos.x, info->MousePos.y)
 #endif


@@ -4047,6 +4047,14 @@ WXHBRUSH wxWindowMSW::MSWGetBgBrush(WXHDC hDC)
     return 0;
 }
 
     return 0;
 }
 

+bool
+wxWindowMSW::MSWPrintChild(wxWindow * WXUNUSED(win),
+                           WXWPARAM WXUNUSED(wParam),
+                           WXLPARAM WXUNUSED(lParam))
+{
+    return false;
+}
+

 // ---------------------------------------------------------------------------
 // moving and resizing
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // moving and resizing
 // ---------------------------------------------------------------------------


@@ -4946,7 +4954,7 @@ int wxCharCodeMSWToWX(int keySym, WXLPARAM lParam)
         case VK_CLEAR:      id = WXK_CLEAR; break;
         case VK_SHIFT:      id = WXK_SHIFT; break;
         case VK_CONTROL:    id = WXK_CONTROL; break;
         case VK_CLEAR:      id = WXK_CLEAR; break;
         case VK_SHIFT:      id = WXK_SHIFT; break;
         case VK_CONTROL:    id = WXK_CONTROL; break;

-        case VK_MENU :      id = WXK_MENU; break;
+        case VK_MENU :      id = WXK_ALT; break;

         case VK_PAUSE:      id = WXK_PAUSE; break;
         case VK_CAPITAL:    id = WXK_CAPITAL; break;
         case VK_SPACE:      id = WXK_SPACE; break;
         case VK_PAUSE:      id = WXK_PAUSE; break;
         case VK_CAPITAL:    id = WXK_CAPITAL; break;
         case VK_SPACE:      id = WXK_SPACE; break;


@@ -5052,7 +5060,6 @@ WXWORD wxCharCodeWXToMSW(int id, bool *isVirtual)
     case WXK_SHIFT:     keySym = VK_SHIFT; break;
     case WXK_CONTROL:   keySym = VK_CONTROL; break;
     case WXK_ALT:       keySym = VK_MENU; break;
     case WXK_SHIFT:     keySym = VK_SHIFT; break;
     case WXK_CONTROL:   keySym = VK_CONTROL; break;
     case WXK_ALT:       keySym = VK_MENU; break;

-    case WXK_MENU :     keySym = VK_MENU; break;

     case WXK_PAUSE:     keySym = VK_PAUSE; break;
     case WXK_CAPITAL:   keySym = VK_CAPITAL; break;
     case WXK_PRIOR:     keySym = VK_PRIOR; break;
     case WXK_PAUSE:     keySym = VK_PAUSE; break;
     case WXK_CAPITAL:   keySym = VK_CAPITAL; break;
     case WXK_PRIOR:     keySym = VK_PRIOR; break;