Fixed some bugs in new code (CanPaste, GetSelection)

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

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 63ddabb570fa13719b66b65e551474464c9bedb0..77e8db8f11ace8a37fa1200473003546b86539af 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -76,7 +76,7 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
     CreateWindowEx(exStyle, "BUTTON", (const char *)label, msStyle,
                     0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                     wxGetInstance(), NULL);
     CreateWindowEx(exStyle, "BUTTON", (const char *)label, msStyle,
                     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);


@@ -89,7 +89,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);


@@ -102,7 +102,7 @@ void wxStaticBox::SetLabel(const wxString& label)
   SetWindowText((HWND)m_hWnd, (const char *)label);
 }
 
   SetWindowText((HWND)m_hWnd, (const char *)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 +131,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 )


@@ -146,7 +146,7 @@ void wxStaticBox::SetSize(int x, int y, int width, int height, int sizeFlags)
 WXHBRUSH wxStaticBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
                        WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
 WXHBRUSH wxStaticBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
                        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);