fixed somebody's poorly done StreamSize-->GetSize transition

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index ac5c4cac6dcf76ffc825c1532b8a2a2a134f4ac7..b9dfdd75e158613783f1340f0a7bbc278cae2e96 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -31,6 +31,7 @@
 #ifndef WX_PRECOMP
     #include <windows.h>
     #include "wx/msw/winundef.h"
 #ifndef WX_PRECOMP
     #include <windows.h>
     #include "wx/msw/winundef.h"

+    #include "wx/window.h"

     #include "wx/accel.h"
     #include "wx/setup.h"
     #include "wx/menu.h"
     #include "wx/accel.h"
     #include "wx/setup.h"
     #include "wx/menu.h"


@@ -79,7 +80,7 @@
 
 #include <string.h>
 
 
 #include <string.h>
 

-#ifndef __GNUWIN32__
+#if !defined(__GNUWIN32__)|| defined(wxUSE_NORLANDER_HEADERS)

     #include <shellapi.h>
     #include <mmsystem.h>
 #endif
     #include <shellapi.h>
     #include <mmsystem.h>
 #endif


@@ -88,13 +89,15 @@
     #include <windowsx.h>
 #endif
 
     #include <windowsx.h>
 #endif
 

-#if ( defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__ )
+#if ( defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__ ) || defined(wxUSE_NORLANDER_HEADERS)

     #include <commctrl.h>
 #endif
 
 #ifndef __TWIN32__
     #ifdef __GNUWIN32__
     #include <commctrl.h>
 #endif
 
 #ifndef __TWIN32__
     #ifdef __GNUWIN32__

-        #include <wx/msw/gnuwin32/extra.h>
+        #ifndef wxUSE_NORLANDER_HEADERS
+            #include <wx/msw/gnuwin32/extra.h>
+        #endif

     #endif
 #endif
 
     #endif
 #endif
 


@@ -281,11 +284,10 @@ wxWindow::~wxWindow()
     {
         if ( !::DestroyWindow(GetHwnd()) )
             wxLogLastError("DestroyWindow");
     {
         if ( !::DestroyWindow(GetHwnd()) )
             wxLogLastError("DestroyWindow");

-    }

 
 

-    // Restore old Window proc, if required and remove hWnd <-> wxWindow
-    // association
-    UnsubclassWin();
+        // remove hWnd <-> wxWindow association
+        wxRemoveHandleAssociation(this);
+    }

 }
 
 // real construction (Init() must have been called before!)
 }
 
 // real construction (Init() must have been called before!)


@@ -297,7 +299,8 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
 {
     wxCHECK_MSG( parent, FALSE, _T("can't create wxWindow without parent") );
 
 {
     wxCHECK_MSG( parent, FALSE, _T("can't create wxWindow without parent") );
 

-    CreateBase(parent, id, pos, size, style, name);
+    if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
+        return FALSE;

 
     parent->AddChild(this);
 
 
     parent->AddChild(this);
 


@@ -328,7 +331,6 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
         // want everything: i.e. all keys and WM_CHAR message
         m_lDlgCode = DLGC_WANTARROWS | DLGC_WANTCHARS |
                      DLGC_WANTTAB | DLGC_WANTMESSAGE;
         // want everything: i.e. all keys and WM_CHAR message
         m_lDlgCode = DLGC_WANTARROWS | DLGC_WANTCHARS |
                      DLGC_WANTTAB | DLGC_WANTMESSAGE;

-        

     }
 
     MSWCreate(m_windowId, parent, wxCanvasClassName, this, NULL,
     }
 
     MSWCreate(m_windowId, parent, wxCanvasClassName, this, NULL,


@@ -448,7 +450,7 @@ bool wxWindow::SetFont(const wxFont& font)
 
         wxASSERT_MSG( hFont, _T("should have valid font") );
 
 
         wxASSERT_MSG( hFont, _T("should have valid font") );
 

-        ::SendMessage(hWnd, WM_SETFONT, (WPARAM)hFont, TRUE);
+        ::SendMessage(hWnd, WM_SETFONT, (WPARAM)hFont, MAKELPARAM(TRUE, 0));

     }
 
     return TRUE;
     }
 
     return TRUE;


@@ -801,10 +803,13 @@ void wxWindow::SubclassWin(WXHWND hWnd)
 {
     wxASSERT_MSG( !m_oldWndProc, _T("subclassing window twice?") );
 
 {
     wxASSERT_MSG( !m_oldWndProc, _T("subclassing window twice?") );
 

-    wxAssociateWinWithHandle((HWND)hWnd, this);
+    HWND hwnd = (HWND)hWnd;
+    wxCHECK_RET( ::IsWindow(hwnd), _T("invalid HWND in SubclassWin") );
+
+    wxAssociateWinWithHandle(hwnd, this);

 
 

-    m_oldWndProc = (WXFARPROC) GetWindowLong((HWND) hWnd, GWL_WNDPROC);
-    SetWindowLong((HWND) hWnd, GWL_WNDPROC, (LONG) wxWndProc);
+    m_oldWndProc = (WXFARPROC) GetWindowLong(hwnd, GWL_WNDPROC);
+    SetWindowLong(hwnd, GWL_WNDPROC, (LONG) wxWndProc);

 }
 
 void wxWindow::UnsubclassWin()
 }
 
 void wxWindow::UnsubclassWin()


@@ -812,16 +817,19 @@ void wxWindow::UnsubclassWin()
     wxRemoveHandleAssociation(this);
 
     // Restore old Window proc
     wxRemoveHandleAssociation(this);
 
     // Restore old Window proc

-    if ( GetHwnd() )
+    HWND hwnd = GetHwnd();
+    if ( hwnd )

     {
     {

-        FARPROC farProc = (FARPROC) GetWindowLong(GetHwnd(), GWL_WNDPROC);
+        m_hWnd = 0;
+
+        wxCHECK_RET( ::IsWindow(hwnd), _T("invalid HWND in SubclassWin") );
+
+        FARPROC farProc = (FARPROC) GetWindowLong(hwnd, GWL_WNDPROC);

         if ( (m_oldWndProc != 0) && (farProc != (FARPROC) m_oldWndProc) )
         {
         if ( (m_oldWndProc != 0) && (farProc != (FARPROC) m_oldWndProc) )
         {

-            SetWindowLong(GetHwnd(), GWL_WNDPROC, (LONG) m_oldWndProc);
+            SetWindowLong(hwnd, GWL_WNDPROC, (LONG) m_oldWndProc);

             m_oldWndProc = 0;
         }
             m_oldWndProc = 0;
         }

-
-        m_hWnd = 0;

     }
 }
 
     }
 }
 


@@ -851,7 +859,8 @@ WXDWORD wxWindow::MakeExtendedStyle(long style, bool eliminateBorders)
 // Determines whether native 3D effects or CTL3D should be used,
 // applying a default border style if required, and returning an extended
 // style to pass to CreateWindowEx.
 // Determines whether native 3D effects or CTL3D should be used,
 // applying a default border style if required, and returning an extended
 // style to pass to CreateWindowEx.

-WXDWORD wxWindow::Determine3DEffects(WXDWORD defaultBorderStyle, bool *want3D)
+WXDWORD wxWindow::Determine3DEffects(WXDWORD defaultBorderStyle,
+                                     bool *want3D) const

 {
     // If matches certain criteria, then assume no 3D effects
     // unless specifically requested (dealt with in MakeExtendedStyle)
 {
     // If matches certain criteria, then assume no 3D effects
     // unless specifically requested (dealt with in MakeExtendedStyle)


@@ -1108,12 +1117,9 @@ void wxWindow::DoGetPosition(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).
 
         // 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).

-        if ( parent )
-        {
-            wxPoint pt(parent->GetClientAreaOrigin());
-            point.x -= pt.x;
-            point.y -= pt.y;
-        }
+        wxPoint pt(parent->GetClientAreaOrigin());
+        point.x -= pt.x;
+        point.y -= pt.y;

     }
 
     if ( x )
     }
 
     if ( x )


@@ -1168,35 +1174,80 @@ void wxWindow::DoGetClientSize(int *x, int *y) const
         *y = rect.bottom;
 }
 
         *y = rect.bottom;
 }
 

+// set the size of the window: if the dimensions are positive, just use them,
+// but if any of them is equal to -1, it means that we must find the value for
+// it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in
+// which case -1 is a valid value for x and y)
+//
+// If sizeFlags contains wxSIZE_AUTO_WIDTH/HEIGHT flags (default), we calculate
+// the width/height to best suit our contents, otherwise we reuse the current
+// width/height

 void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
 void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {

+    // get the current size and position...

     int currentX, currentY;
     GetPosition(&currentX, &currentY);
     int currentW,currentH;
     GetSize(&currentW, &currentH);
 
     int currentX, currentY;
     GetPosition(&currentX, &currentY);
     int currentW,currentH;
     GetSize(&currentW, &currentH);
 

-    if ( x == currentX && y == currentY && width == currentW && height == currentH )
+    // ... and don't do anything (avoiding flicker) if it's already ok
+    if ( x == currentX && y == currentY &&
+         width == currentW && height == currentH )
+    {

         return;
         return;

+    }

 
 

-    int actualWidth = width;
-    int actualHeight = height;
-    int actualX = x;
-    int actualY = y;

     if ( x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
     if ( x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )

-        actualX = currentX;
+        x = currentX;

     if ( y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
     if ( y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )

-        actualY = currentY;
+        y = currentY;

 
 

-    AdjustForParentClientOrigin(actualX, actualY, sizeFlags);
+    AdjustForParentClientOrigin(x, y, sizeFlags);

 
 

+    wxSize size(-1, -1);

     if ( width == -1 )
     if ( width == -1 )

-        actualWidth = currentW;
+    {
+        if ( sizeFlags && wxSIZE_AUTO_WIDTH )
+        {
+            size = DoGetBestSize();
+            width = size.x;
+        }
+        else
+        {
+            // just take the current one
+            width = currentW;
+        }
+    }
+

     if ( height == -1 )
     if ( height == -1 )

-        actualHeight = currentH;
+    {
+        if ( sizeFlags && wxSIZE_AUTO_HEIGHT )
+        {
+            if ( size.x == -1 )
+            {
+                size= DoGetBestSize();
+            }
+            //else: already called DoGetBestSize() above

 
 

-    HWND hWnd = GetHwnd();
-    if ( hWnd )
-        MoveWindow(hWnd, actualX, actualY, actualWidth, actualHeight, (BOOL)TRUE);
+            height = size.y;
+        }
+        else
+        {
+            // just take the current one
+            height = currentH;
+        }
+    }
+
+    if ( !::MoveWindow(GetHwnd(), x, y, width, height, TRUE) )
+    {
+        wxLogLastError("MoveWindow");
+    }
+}
+
+// for a generic window there is no natural best size - just use the current one
+wxSize wxWindow::DoGetBestSize()
+{
+    return GetSize();

 }
 
 void wxWindow::DoSetClientSize(int width, int height)
 }
 
 void wxWindow::DoSetClientSize(int width, int height)


@@ -1312,7 +1363,7 @@ void wxWindow::GetTextExtent(const wxString& string,
 
     SIZE sizeRect;
     TEXTMETRIC tm;
 
     SIZE sizeRect;
     TEXTMETRIC tm;

-    GetTextExtentPoint(dc, (const wxChar *)string, (int)string.Length(), &sizeRect);
+    GetTextExtentPoint(dc, string, (int)string.Length(), &sizeRect);

     GetTextMetrics(dc, &tm);
 
     if ( fontToUse && fnt && hfontOld )
     GetTextMetrics(dc, &tm);
 
     if ( fontToUse && fnt && hfontOld )


@@ -1320,10 +1371,14 @@ void wxWindow::GetTextExtent(const wxString& string,
 
     ReleaseDC(hWnd, dc);
 
 
     ReleaseDC(hWnd, dc);
 

-    if ( x ) *x = sizeRect.cx;
-    if ( y ) *y = sizeRect.cy;
-    if ( descent ) *descent = tm.tmDescent;
-    if ( externalLeading ) *externalLeading = tm.tmExternalLeading;
+    if ( x )
+        *x = sizeRect.cx;
+    if ( y )
+        *y = sizeRect.cy;
+    if ( descent )
+        *descent = tm.tmDescent;
+    if ( externalLeading )
+        *externalLeading = tm.tmExternalLeading;

 }
 
 #if wxUSE_CARET && WXWIN_COMPATIBILITY
 }
 
 #if wxUSE_CARET && WXWIN_COMPATIBILITY


@@ -1368,6 +1423,31 @@ void wxWindow::GetCaretPos(int *x, int *y) const
 }
 #endif // wxUSE_CARET
 
 }
 #endif // wxUSE_CARET
 

+// ---------------------------------------------------------------------------
+// popup menu
+// ---------------------------------------------------------------------------
+
+bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
+{
+    menu->SetInvokingWindow(this);
+    menu->UpdateUI();
+
+    HWND hWnd = GetHwnd();
+    HMENU hMenu = GetHmenuOf(menu);
+    POINT point;
+    point.x = x;
+    point.y = y;
+    ::ClientToScreen(hWnd, &point);
+    wxCurrentPopupMenu = menu;
+    ::TrackPopupMenu(hMenu, TPM_RIGHTBUTTON, point.x, point.y, 0, hWnd, NULL);
+    wxYield();
+    wxCurrentPopupMenu = NULL;
+
+    menu->SetInvokingWindow(NULL);
+
+    return TRUE;
+}
+

 // ===========================================================================
 // pre/post message processing
 // ===========================================================================
 // ===========================================================================
 // pre/post message processing
 // ===========================================================================


@@ -1454,9 +1534,28 @@ bool wxWindow::MSWProcessMessage(WXMSG* pMsg)
                             // buttons want process Enter themselevs
                             bProcess = FALSE;
                         }
                             // buttons want process Enter themselevs
                             bProcess = FALSE;
                         }

-                        // else: but if it does not it makes sense to make it
-                        //       work like a TAB - and that's what we do.
-                        //       Note that Ctrl-Enter always works this way.
+                        else
+                        {
+                            wxPanel *panel = wxDynamicCast(this, wxPanel);
+                            wxButton *btn = NULL;
+                            if ( panel )
+                            {
+                                // panel may have a default button which should
+                                // be activated by Enter
+                                btn = panel->GetDefaultItem();
+                            }
+
+                            if ( btn && btn->IsEnabled() )
+                            {
+                                // if we do have a default button, do press it
+                                btn->MSWCommand(BN_CLICKED, 0 /* unused */);
+
+                                return TRUE;
+                            }
+                            // else: but if it does not it makes sense to make
+                            //       it work like a TAB - and that's what we do.
+                            //       Note that Ctrl-Enter always works this way.
+                        }

                     }
                     break;
 
                     }
                     break;
 


@@ -1504,10 +1603,7 @@ bool wxWindow::MSWProcessMessage(WXMSG* pMsg)
 
 bool wxWindow::MSWTranslateMessage(WXMSG* pMsg)
 {
 
 bool wxWindow::MSWTranslateMessage(WXMSG* pMsg)
 {

-    return m_acceleratorTable.Ok() &&
-           ::TranslateAccelerator(GetHwnd(),
-                                  GetTableHaccel(m_acceleratorTable),
-                                  (MSG *)pMsg);
+    return m_acceleratorTable.Translate(this, pMsg);

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


@@ -1737,8 +1833,8 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
         case WM_MBUTTONUP:
         case WM_MBUTTONDBLCLK:
             {
         case WM_MBUTTONUP:
         case WM_MBUTTONDBLCLK:
             {

-                int x = LOWORD(lParam);
-                int y = HIWORD(lParam);
+                short x = LOWORD(lParam);
+                short y = HIWORD(lParam);

 
                 processed = HandleMouseEvent(message, x, y, wParam);
             }
 
                 processed = HandleMouseEvent(message, x, y, wParam);
             }


@@ -2161,6 +2257,12 @@ bool wxWindow::MSWCreate(int id,
         if ( style & WS_CHILD )
             controlId = id;
 
         if ( style & WS_CHILD )
             controlId = id;
 

+        wxString className(wclass);
+        if ( GetWindowStyleFlag() & wxNO_FULL_REPAINT_ON_RESIZE )
+        {
+            className += _T("NR");
+        }
+

         m_hWnd = (WXHWND)CreateWindowEx(extendedStyle,
                                         wclass,
                                         title ? title : _T(""),
         m_hWnd = (WXHWND)CreateWindowEx(extendedStyle,
                                         wclass,
                                         title ? title : _T(""),


@@ -3220,8 +3322,11 @@ void wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font)
         SelectObject(dc,was);
     }
     ReleaseDC((HWND)wnd, dc);
         SelectObject(dc,was);
     }
     ReleaseDC((HWND)wnd, dc);

-    *x = tm.tmAveCharWidth;
-    *y = tm.tmHeight + tm.tmExternalLeading;
+
+    if ( x )
+        *x = tm.tmAveCharWidth;
+    if ( y )
+        *y = tm.tmHeight + tm.tmExternalLeading;

 
     //  if ( the_font )
     //    the_font->ReleaseResource();
 
     //  if ( the_font )
     //    the_font->ReleaseResource();