Fixed some bugs in new code (CanPaste, GetSelection)

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

diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp
index b45ca5e0cbee045440bda99016a3348b5c8e4e41..c9f7ca1bca143576075cb2775ede4811ef94442a 100644 (file)
--- 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
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

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

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


@@ -21,7 +21,9 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+#include "wx/event.h"

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

+#include "wx/brush.h"

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


@@ -46,9 +48,9 @@ bool wxStaticText::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;


@@ -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.
 
   // 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;
 
     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);
 
                          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
 
 /*
   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);
   SetSize(x, y, width, height);

+

   return TRUE;
 }
 
   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);
 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);


@@ -114,7 +116,7 @@ void wxStaticText::SetSize(int x, int y, int width, int height, int sizeFlags)
   int cyf;
 
   ::GetWindowText((HWND) GetHWND(), buf, 300);
   int cyf;
 
   ::GetWindowText((HWND) GetHWND(), buf, 300);

-  GetTextExtent(buf, &current_width, &cyf, NULL, NULL,GetFont());
+  GetTextExtent(buf, &current_width, &cyf, NULL, NULL, & this->GetFont());

 
   int ww, hh;
   GetSize(&ww, &hh);
 
   int ww, hh;
   GetSize(&ww, &hh);


@@ -126,7 +128,7 @@ void wxStaticText::SetSize(int x, int y, int width, int height, int sizeFlags)
   {
     int cx;
     int cy;
   {
     int cx;
     int cy;

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

     actualWidth = (int)(current_width + cx) ;
   }
 
     actualWidth = (int)(current_width + cx) ;
   }
 


@@ -159,21 +161,21 @@ void wxStaticText::SetLabel(const wxString& label)
     ::ScreenToClient((HWND) parent->GetHWND(), &point);
   }
 
     ::ScreenToClient((HWND) parent->GetHWND(), &point);
   }
 

-  GetTextExtent(label, &w, &h, NULL, NULL, GetFont());
+  GetTextExtent(label, &w, &h, NULL, NULL, & this->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,
   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 ( m_useCtl3D )
   {
     HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);

-      
+

     if (hbrush != (HBRUSH) 0)
       return hbrush;
     else
     if (hbrush != (HBRUSH) 0)
       return hbrush;
     else