X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/81d66cf39f810503baed79213bc3122fda0ccc7b..a4fe6524851ebeed1f6d24e8e3fa53b706479ff6:/src/msw/stattext.cpp

diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp
index e203b5ebd7..d8308232ea 100644
--- a/src/msw/stattext.cpp
+++ b/src/msw/stattext.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -21,7 +21,9 @@
 #endif
 
 #ifndef WX_PRECOMP
+#include "wx/event.h"
 #include "wx/app.h"
+#include "wx/brush.h"
 #endif
 
 #include "wx/stattext.h"
@@ -42,13 +44,13 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
   SetName(name);
   if (parent) parent->AddChild(this);
 
-  SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
-  SetForegroundColour(parent->GetDefaultForegroundColour()) ;
+  SetBackgroundColour(parent->GetBackgroundColour()) ;
+  SetForegroundColour(parent->GetForegroundColour()) ;
 
   if ( id == -1 )
-  	m_windowId = (int)NewControlId();
+    m_windowId = (int)NewControlId();
   else
-	m_windowId = id;
+  m_windowId = id;
 
   int x = pos.x;
   int y = pos.y;
@@ -67,32 +69,32 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
 
   // Even with extended styles, need to combine with WS_BORDER
   // for them to look right.
-  if ((m_windowStyle & wxSIMPLE_BORDER) || (m_windowStyle & wxRAISED_BORDER) ||
-       (m_windowStyle & wxSUNKEN_BORDER) || (m_windowStyle & wxDOUBLE_BORDER))
+  if ( wxStyleHasBorder(m_windowStyle) )
     msStyle |= WS_BORDER;
 
-  HWND static_item = CreateWindowEx(MakeExtendedStyle(m_windowStyle), "STATIC", (const char *)label,
+  m_hWnd = (WXHWND)::CreateWindowEx(MakeExtendedStyle(m_windowStyle), "STATIC", (const char *)label,
                          msStyle,
                          0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                          wxGetInstance(), NULL);
 
-#if CTL3D
+  wxCHECK_MSG( m_hWnd, FALSE, "Failed to create static ctrl" );
+
+#if wxUSE_CTL3D
 /*
   if (!(GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS))
     Ctl3dSubclassCtl(static_item);
 */
 #endif
 
-  m_hWnd = (WXHWND)static_item;
-
-  SubclassWin((WXHWND)static_item);
+  SubclassWin(m_hWnd);
 
-  SetFont(* parent->GetFont());
+  SetFont(parent->GetFont());
   SetSize(x, y, width, height);
+
   return TRUE;
 }
 
-void wxStaticText::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxStaticText::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);
@@ -109,12 +111,11 @@ void wxStaticText::SetSize(int x, int y, int width, int height, int sizeFlags)
   int actualWidth = width;
   int actualHeight = height;
 
-  char buf[300];
   int current_width;
   int cyf;
 
-  ::GetWindowText((HWND) GetHWND(), buf, 300);
-  GetTextExtent(buf, &current_width, &cyf, NULL, NULL,GetFont());
+  wxString text(wxGetWindowText(GetHWND()));
+  GetTextExtent(text, &current_width, &cyf, NULL, NULL, & GetFont());
 
   int ww, hh;
   GetSize(&ww, &hh);
@@ -126,7 +127,7 @@ void wxStaticText::SetSize(int x, int y, int width, int height, int sizeFlags)
   {
     int cx;
     int cy;
-    wxGetCharSize(GetHWND(), &cx, &cy,GetFont());
+    wxGetCharSize(GetHWND(), &cx, &cy, & GetFont());
     actualWidth = (int)(current_width + cx) ;
   }
 
@@ -143,14 +144,13 @@ void wxStaticText::SetSize(int x, int y, int width, int height, int sizeFlags)
 
 void wxStaticText::SetLabel(const wxString& label)
 {
-  int w, h;
-  RECT rect;
-
   wxWindow *parent = GetParent();
+
+  RECT rect;
   GetWindowRect((HWND) GetHWND(), &rect);
 
-  // Since we now have the absolute screen coords,
-  // if there's a parent we must subtract its top left corner
+  // Since we now have the absolute screen coords, if there's a parent we must
+  // subtract its top left corner
   POINT point;
   point.x = rect.left;
   point.y = rect.top;
@@ -159,21 +159,21 @@ void wxStaticText::SetLabel(const wxString& label)
     ::ScreenToClient((HWND) parent->GetHWND(), &point);
   }
 
-  GetTextExtent(label, &w, &h, NULL, NULL, GetFont());
-  MoveWindow((HWND) GetHWND(), point.x, point.y, (int)(w + 10), (int)h,
-             TRUE);
+  int w, h;
+  GetTextExtent(label, &w, &h, NULL, NULL, & GetFont());
+  MoveWindow((HWND) GetHWND(), point.x, point.y, (int)(w + 10), (int)h, TRUE);
   SetWindowText((HWND) GetHWND(), (const char *)label);
 }
 
 WXHBRUSH wxStaticText::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 (hbrush != (HBRUSH) 0)
       return hbrush;
     else