Applied a few old patches,

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

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index eb82270972f24a35402388ca42ec610053aa0823..10f9310197bdb05cb63f7b854688f7bcb1557ecf 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -20,19 +20,21 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#include "wx/window.h"
+#include "wx/msw/private.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/dcclient.h"

 #include "wx/app.h"
 #include "wx/app.h"

+#include "wx/dcclient.h"

 #endif
 
 #include "wx/statbox.h"
 #endif
 
 #include "wx/statbox.h"

-#include "wx/msw/private.h"

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxStaticBox, wxControl)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxStaticBox, wxControl)

-       EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground)
+    EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground)

 END_EVENT_TABLE()
 
 #endif
 END_EVENT_TABLE()
 
 #endif


@@ -56,9 +58,9 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
   SetForegroundColour(parent->GetForegroundColour()) ;
 
   if ( id == -1 )
   SetForegroundColour(parent->GetForegroundColour()) ;
 
   if ( id == -1 )

-       m_windowId = (int)NewControlId();
+      m_windowId = (int)NewControlId();

   else
   else

-       m_windowId = id;
+    m_windowId = id;

 
   int x = pos.x;
   int y = pos.y;
 
   int x = pos.x;
   int y = pos.y;


@@ -73,14 +75,14 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
   WXDWORD exStyle = Determine3DEffects(0, &want3D) ;
 
   HWND wx_button =
   WXDWORD exStyle = Determine3DEffects(0, &want3D) ;
 
   HWND wx_button =

-    CreateWindowEx(exStyle, "BUTTON", (const char *)label, msStyle,
+    CreateWindowEx(exStyle, _T("BUTTON"), (const wxChar *)label, msStyle,

                     0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                     wxGetInstance(), NULL);
                     0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                     wxGetInstance(), NULL);

-#if CTL3D
+#if wxUSE_CTL3D

   if (want3D)
   {
     Ctl3dSubclassCtl(wx_button);
   if (want3D)
   {
     Ctl3dSubclassCtl(wx_button);

-         m_useCtl3D = TRUE;
+      m_useCtl3D = TRUE;

   }
 #endif
 
   }
 #endif
 


@@ -97,56 +99,26 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
   return TRUE;
 }
 
   return TRUE;
 }
 

-void wxStaticBox::SetLabel(const wxString& label)
-{
-  SetWindowText((HWND)m_hWnd, (const char *)label);
-}
-
-void wxStaticBox::SetSize(int x, int y, int width, int height, int sizeFlags)
+wxSize wxStaticBox::DoGetBestSize()

 {
 {

-  int currentX, currentY;
-  GetPosition(&currentX, &currentY);
-
-  int x1 = x;
-  int y1 = y;
-  int w1 = width;
-  int h1 = height;
+    int cx, cy;
+    wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());

 
 

-  if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    x1 = currentX;
-  if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    y1 = currentY;
+    int wBox;
+    GetTextExtent(wxGetWindowText(m_hWnd), &wBox, &cy);

 
 

-  AdjustForParentClientOrigin(x1, y1, sizeFlags);
-
-  // If we're prepared to use the existing size, then...
-  if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO))
-  {
-    GetSize(&w1, &h1);
-  }
+    wBox += 3*cx;
+    int hBox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);

 
 

-  int current_width;
-
-  int cx;
-  int cy;
-  int cyf;
-
-  wxGetCharSize(GetHWND(), &cx, &cy, & GetFont());
-
-  GetTextExtent(wxGetWindowText(m_hWnd), &current_width, &cyf,
-                NULL,NULL, & GetFont());
-  if ( w1 < 0 )
-   w1 = current_width + 3*cx;
-  if ( h1 < 0 )
-    h1 = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cyf);
-
-  MoveWindow((HWND)m_hWnd, x1, y1, w1, h1, TRUE);
+    return wxSize(wBox, hBox);

 }
 
 WXHBRUSH wxStaticBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
 }
 
 WXHBRUSH wxStaticBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,

-                       WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+                                 WXUINT message,
+                                 WXWPARAM wParam,
+                                 WXLPARAM lParam)

 {
 {

-#if CTL3D
+#if wxUSE_CTL3D

   if ( m_useCtl3D )
   {
     HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
   if ( m_useCtl3D )
   {
     HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);


@@ -189,9 +161,9 @@ void wxStaticBox::OnEraseBackground(wxEraseEvent& event)
     // Alternatively, just make sure that wxStaticBox is always at the back! There are probably
     // few other circumstances where it matters about child clipping. But what about painting onto
     // to panel, inside a groupbox? Doesn't appear, because the box wipes it out.
     // Alternatively, just make sure that wxStaticBox is always at the back! There are probably
     // few other circumstances where it matters about child clipping. But what about painting onto
     // to panel, inside a groupbox? Doesn't appear, because the box wipes it out.

-  wxWindow *parent = GetParent();
-  if ( parent && parent->GetHWND() && (::GetWindowLong((HWND) parent->GetHWND(), GWL_STYLE) & WS_CLIPCHILDREN) )
-  {
+    wxWindow *parent = GetParent();
+    if ( parent && parent->GetHWND() && (::GetWindowLong((HWND) parent->GetHWND(), GWL_STYLE) & WS_CLIPCHILDREN) )
+    {

         // TODO: May in fact need to generate a paint event for inside this
         // control's rectangle, otherwise all controls are going to be clipped -
         // ugh.
         // TODO: May in fact need to generate a paint event for inside this
         // control's rectangle, otherwise all controls are going to be clipped -
         // ugh.


@@ -200,18 +172,20 @@ void wxStaticBox::OnEraseBackground(wxEraseEvent& event)
 
         RECT rect;
 
 
         RECT rect;
 

-        ::GetClientRect((HWND) GetHWND(), &rect);
+        ::GetClientRect(GetHwnd(), &rect);

         ::FillRect ((HDC) event.GetDC()->GetHDC(), &rect, hBrush);
         ::DeleteObject(hBrush);
         ::SetMapMode((HDC) event.GetDC()->GetHDC(), mode);
         ::FillRect ((HDC) event.GetDC()->GetHDC(), &rect, hBrush);
         ::DeleteObject(hBrush);
         ::SetMapMode((HDC) event.GetDC()->GetHDC(), mode);

-  }
-  else
-       Default();
+    }
+    else
+    {
+        event.Skip();
+    }

 }
 
 long wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
 }
 
 long wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {

-       if (nMsg == WM_NCHITTEST)
+    if ( nMsg == WM_NCHITTEST)

     {
         int xPos = LOWORD(lParam);  // horizontal position of cursor
         int yPos = HIWORD(lParam);  // vertical position of cursor
     {
         int xPos = LOWORD(lParam);  // horizontal position of cursor
         int yPos = HIWORD(lParam);  // vertical position of cursor


@@ -224,6 +198,6 @@ long wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
             return (long)HTCLIENT;
     }
 
             return (long)HTCLIENT;
     }
 

-       return wxControl::MSWWindowProc(nMsg, wParam, lParam);
+    return wxControl::MSWWindowProc(nMsg, wParam, lParam);

 }
 
 }