better update rect calculation

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

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 63ddabb570fa13719b66b65e551474464c9bedb0..6ca6074e54a9fdcdcc33e99a471fa941ec08b9e9 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
 


@@ -89,7 +91,7 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
   // Subclass again for purposes of dialog editing mode
   SubclassWin(GetHWND());
 
   // Subclass again for purposes of dialog editing mode
   SubclassWin(GetHWND());
 

-  SetFont(* parent->GetFont());
+  SetFont(parent->GetFont());

 
   SetSize(x, y, width, height);
   ShowWindow(wx_button, SW_SHOW);
 
   SetSize(x, y, width, height);
   ShowWindow(wx_button, SW_SHOW);


@@ -99,10 +101,10 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
 
 void wxStaticBox::SetLabel(const wxString& label)
 {
 
 void wxStaticBox::SetLabel(const wxString& label)
 {

-  SetWindowText((HWND)m_hWnd, (const char *)label);
+  SetWindowText((HWND)m_hWnd, (const wxChar *)label);

 }
 
 }
 

-void wxStaticBox::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxStaticBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)

 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);
 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);


@@ -131,10 +133,10 @@ void wxStaticBox::SetSize(int x, int y, int width, int height, int sizeFlags)
   int cy;
   int cyf;
 
   int cy;
   int cyf;
 

-  wxGetCharSize(GetHWND(), &cx, &cy,GetFont());
+  wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont());

 
   GetTextExtent(wxGetWindowText(m_hWnd), &current_width, &cyf,
 
   GetTextExtent(wxGetWindowText(m_hWnd), &current_width, &cyf,

-                NULL,NULL,GetFont());
+                NULL,NULL, & this->GetFont());

   if ( w1 < 0 )
    w1 = current_width + 3*cx;
   if ( h1 < 0 )
   if ( w1 < 0 )
    w1 = current_width + 3*cx;
   if ( h1 < 0 )


@@ -144,9 +146,9 @@ void wxStaticBox::SetSize(int x, int y, int width, int height, int sizeFlags)
 }
 
 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);


@@ -206,12 +208,14 @@ void wxStaticBox::OnEraseBackground(wxEraseEvent& event)
         ::SetMapMode((HDC) event.GetDC()->GetHDC(), mode);
   }
   else
         ::SetMapMode((HDC) event.GetDC()->GetHDC(), mode);
   }
   else

-       Default();
+  {
+    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 +228,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);

 }
 
 }