Applied patch [ 807164 ] fixes for core library

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

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 25f303c58a120d9b8fcc07470a4bf86ec0f4a953..f8cbe78e4f169c7c57ab030bb44ec9c01bd464ec 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -1,251 +1,191 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        statbox.cpp
+// Name:        msw/statbox.cpp

 // Purpose:     wxStaticBox
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Purpose:     wxStaticBox
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "statbox.h"
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma implementation "statbox.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_STATBOX
+

 #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)
-       EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground)
-END_EVENT_TABLE()

 
 

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

 
 

+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxStaticBoxStyle )
+
+wxBEGIN_FLAGS( wxStaticBoxStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+    
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxNO_BORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+wxEND_FLAGS( wxStaticBoxStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBox, wxControl,"wx/statbox.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxStaticBox)
+       wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxStaticBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style

 /*
 /*

- * Group box
- */
- 
-bool wxStaticBox::Create(wxWindow *parent, const wxWindowID id,
-           const wxString& label,
-           const wxPoint& pos,
-           const wxSize& size,
-           const long style,
-           const wxString& name)
-{
-  SetName(name);
+       TODO PROPERTIES :
+               label
+*/
+wxEND_PROPERTIES_TABLE()

 
 

-  if (parent) parent->AddChild(this);
+wxBEGIN_HANDLERS_TABLE(wxStaticBox)
+wxEND_HANDLERS_TABLE()

 
 

-  SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
-  SetForegroundColour(parent->GetDefaultForegroundColour()) ;
-
-  if ( id == -1 )
-       m_windowId = (int)NewControlId();
-  else
-       m_windowId = id;
-
-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
-
-  m_windowStyle = style;
-
-  long msStyle = BS_GROUPBOX | WS_CHILD | WS_VISIBLE ; // GROUP_FLAGS;
-
-  bool want3D;
-  WXDWORD exStyle = Determine3DEffects(0, &want3D) ;
-
-  HWND wx_button =
-    CreateWindowEx(exStyle, "BUTTON", (const char *)label, msStyle,
-                    0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
-                    wxGetInstance(), NULL);
-#if CTL3D
-  if (want3D)
-  {
-    Ctl3dSubclassCtl(wx_button);
-         m_useCtl3D = TRUE;
-  }
+wxCONSTRUCTOR_6( wxStaticBox , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle ) 
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)

 #endif
 
 #endif
 

-  m_hWnd = (WXHWND)wx_button;
-
-  // Subclass again for purposes of dialog editing mode
-  SubclassWin(GetHWND());
-
-  SetFont(* parent->GetFont());
-
-  SetSize(x, y, width, height);
-  ShowWindow(wx_button, SW_SHOW);
-
-  return TRUE;
-}
-
-void wxStaticBox::SetLabel(const wxString& label)
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxStaticBox
+// ----------------------------------------------------------------------------
+
+bool wxStaticBox::Create(wxWindow *parent,
+                         wxWindowID id,
+                         const wxString& label,
+                         const wxPoint& pos,
+                         const wxSize& size,
+                         long style,
+                         const wxString& name)

 {
 {

-  SetWindowText((HWND)m_hWnd, (const char *)label);
-}
-
-void wxStaticBox::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
-{
-  int currentX, currentY;
-  GetPosition(&currentX, &currentY);
-
-  int x1 = x;
-  int y1 = y;
-  int w1 = width;
-  int h1 = height;
-
-  if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    x1 = currentX;
-  if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    y1 = currentY;
-
-  // If we're prepared to use the existing size, then...
-  if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO))
-  {
-    GetSize(&w1, &h1);
-  }
-
-  char buf[300];
-
-  float current_width;
-
-  int cx;
-  int cy;
-  float cyf;
-
-  HWND button = (HWND)m_hWnd;
-  wxGetCharSize(GetHWND(), &cx, &cy,GetFont());
-
-  GetWindowText(button, buf, 300);
-  GetTextExtent(buf, &current_width, &cyf,NULL,NULL,GetFont());
-  if (w1 < 0)
-   w1 = (int)(current_width + 3*cx) ;
-  if (h1<0)
-    h1 = (int)(cyf*EDIT_CONTROL_FACTOR) ;
-  MoveWindow(button, x1, y1, w1, h1, TRUE);
-
-#if WXWIN_COMPATIBILITY
-  GetEventHandler()->OldOnSize(width, height);
+    if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
+        return FALSE;
+
+    // as wxStaticBox doesn't draw its own background, we make it transparent
+    // to force redrawing its background which could have been overwritten by
+    // the other controls inside it
+    //
+    // FIXME: I still think that it isn't the right solution because the static
+    //        boxes shouldn't have to be transparent if the redrawing was done
+    //        right elsewhere - who ever had to make them transparent in non
+    //        wxWindows programs, after all? But for now it does fix a serious
+    //        problem (try resizing the sizers test screen in the layout sample
+    //        after removing WS_EX_TRANSPARENT bit) and so let's use it until
+    //        we fix the real underlying problem
+    if ( !MSWCreateControl(wxT("BUTTON"), BS_GROUPBOX, pos, size, label,
+#ifdef __WXWINCE__
+        0

 #else
 #else

-  wxSizeEvent event(wxSize(width, height), m_windowId);
-  event.eventObject = this;
-  GetEventHandler()->ProcessEvent(event);
+        WS_EX_TRANSPARENT

 #endif
 #endif

-}
+                           ) )
+        return FALSE;

 
 

-WXHBRUSH wxStaticBox::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
-                       WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
-{
-#if CTL3D
-  if ( m_useCtl3D )
-  {
-    HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
-    return (WXHBRUSH) hbrush;
-  }
-#endif
+    // to be transparent we should have the same colour as the parent as well
+    SetBackgroundColour(GetParent()->GetBackgroundColour());

 
 

-  if (GetParent()->GetTransparentBackground())
-    SetBkMode((HDC) pDC, TRANSPARENT);
-  else
-    SetBkMode((HDC) pDC, OPAQUE);
+    return TRUE;
+}

 
 

-  ::SetBkColor((HDC) pDC, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
-  ::SetTextColor((HDC) pDC, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));
+wxSize wxStaticBox::DoGetBestSize() const
+{
+    int cx, cy;
+    wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());

 
 

-  wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);
+    int wBox;
+    GetTextExtent(wxGetWindowText(m_hWnd), &wBox, &cy);

 
 

-  // Note that this will be cleaned up in wxApp::OnIdle, if backgroundBrush
-  // has a zero usage count.
-//  backgroundBrush->RealizeResource();
-  return (WXHBRUSH) backgroundBrush->GetResourceHandle();
-}
+    wBox += 3*cx;
+    int hBox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);

 
 

-// Shouldn't erase the whole window, since the static box must only paint its
-// outline.
-void wxStaticBox::OnEraseBackground(wxEraseEvent& event)
-{
-    // If we don't have this (call Default()), we don't paint the background properly.
-    // If we do have this, we seem to overwrite enclosed controls.
-    // Is it the WS_CLIPCHILDREN style that's causing the problems?
-    // Probably - without this style, the background of the window will show through,
-    // so the control doesn't have to paint it. The window background will always be
-    // painted before all other controls, therefore there are no problems with
-    // controls being hidden by the static box.
-    // So, if we could specify wxCLIP_CHILDREN in window, or not, we could optimise painting better.
-    // We would assume wxCLIP_CHILDREN in a frame and a scrolled window, but not in a panel.
-    // Is this too platform-specific?? What else can we do? Not a lot, since we have to pass
-    // this information from arbitrary wxWindow derivatives, and it depends on what you wish to
-    // do with the windows.
-    // 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) )
-  {
-        // 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.
-        HBRUSH hBrush = ::CreateSolidBrush(PALETTERGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
-        int mode = ::SetMapMode((HDC) event.GetDC()->GetHDC(), MM_TEXT);
-
-        RECT rect;
-
-        ::GetClientRect((HWND) GetHWND(), &rect);
-        ::FillRect ((HDC) event.GetDC()->GetHDC(), &rect, hBrush);
-        ::DeleteObject(hBrush);
-        ::SetMapMode((HDC) event.GetDC()->GetHDC(), mode);
-  }
-  else
-       Default();
+    return wxSize(wBox, hBox);

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

-       // TODO: somehow, this has to accept mouse clicks in user interface edit mode,
-       // but not otherwise. Only there is no longer a UI edit mode...
-
-       // It worked before because the message could be processed if not in UI
-       // edit mode. We have to find some way of distinguishing this.
-       // Maybe this class can have an AcceptMouseEvents(bool) function; a sort of
-       // kludge... or, we can search for an active event table entry that will
-       // intercept mouse events, and if one exists (that isn't the default),
-       // skip the code below. Too time consuming though.
-       // Perhaps it's ok to do the default thing *anyway* because the title or edge
-       // of the window may still be active!
-//     if (nMsg == WM_NCHITTEST)
-//            return Default();
-
-       if (nMsg == WM_NCHITTEST)
+    switch ( nMsg )

     {
     {

-        int xPos = LOWORD(lParam);  // horizontal position of cursor
-        int yPos = HIWORD(lParam);  // vertical position of cursor
-
-        ScreenToClient(&xPos, &yPos);
-
-        // Make sure you can drag by the top of the groupbox, but let
-        // other (enclosed) controls get mouse events also
-        if (yPos < 10)
-            return (long)HTCLIENT;
+#ifndef __WXWINCE__
+        case WM_NCHITTEST:
+            // FIXME: this hack is specific to dialog ed, shouldn't it be
+            //        somehow disabled during normal operation?
+            {
+                int xPos = LOWORD(lParam);  // horizontal position of cursor
+                int yPos = HIWORD(lParam);  // vertical position of cursor
+
+                ScreenToClient(&xPos, &yPos);
+
+                // Make sure you can drag by the top of the groupbox, but let
+                // other (enclosed) controls get mouse events also
+                if ( yPos < 10 )
+                    return (long)HTCLIENT;
+            }
+            break;
+#endif
+        case WM_ERASEBKGND:
+            // prevent wxControl from processing this message because it will
+            // erase the background incorrectly and there is no way for us to
+            // override this at wxWin event level (if we do process the event,
+            // we don't know how to do it properly - paint the background
+            // without painting over other controls - and if we don't,
+            // wxControl still gets it)
+            return MSWDefWindowProc(nMsg, wParam, lParam);

     }
 
     }
 

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

 }
 
 }
 

+#endif // wxUSE_STATBOX