X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e320a79f187558effb04d92020b470372bbe456..24f932d22a085ce899b94c98578f475782c75bf6:/src/os2/statbox.cpp diff --git a/src/os2/statbox.cpp b/src/os2/statbox.cpp index b239dc738c..571107c39b 100644 --- a/src/os2/statbox.cpp +++ b/src/os2/statbox.cpp @@ -1,62 +1,135 @@ ///////////////////////////////////////////////////////////////////////////// // Name: statbox.cpp // Purpose: wxStaticBox -// Author: AUTHOR +// Author: David Webster // Modified by: // Created: ??/??/98 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) David Webster +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "statbox.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#include "wx/window.h" +#include "wx/os2/private.h" + +#ifndef WX_PRECOMP +#include "wx/app.h" +#include "wx/dcclient.h" #endif #include "wx/statbox.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl) -BEGIN_EVENT_TABLE(wxStaticBox, wxControl) - EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground) -END_EVENT_TABLE() - +bool wxStaticBox::Create( + wxWindow* pParent +, wxWindowID vId +, const wxString& rsLabel +, const wxPoint& rPos +, const wxSize& rSize +, long lStyle +, const wxString& rsName +) +{ + if(!CreateControl( pParent + ,vId + ,rPos + ,rSize + ,lStyle +#if wxUSE_VALIDATORS + ,wxDefaultValidator #endif + ,rsName + )) + { + return FALSE; + } -/* - * Static box - */ - -bool wxStaticBox::Create(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - SetName(name); + wxPoint vPos(0,0); + wxSize vSize(0,0); + + if (!OS2CreateControl( "STATIC" + ,SS_GROUPBOX + ,vPos + ,vSize + ,rsLabel + )) + { + return FALSE; + } - if (parent) parent->AddChild(this); + // + // To be transparent we should have the same colour as the parent as well + // + SetBackgroundColour(GetParent()->GetBackgroundColour()); - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; + wxColour vColour; - m_windowStyle = style; + vColour.Set(wxString("BLACK")); - // TODO: create static box - return FALSE; -} + LONG lColor = (LONG)vColour.GetPixel(); -void wxStaticBox::SetLabel(const wxString& label) + ::WinSetPresParam( m_hWnd + ,PP_FOREGROUNDCOLOR + ,sizeof(LONG) + ,(PVOID)&lColor + ); + lColor = (LONG)m_backgroundColour.GetPixel(); + + ::WinSetPresParam( m_hWnd + ,PP_BACKGROUNDCOLOR + ,sizeof(LONG) + ,(PVOID)&lColor + ); + wxFont* pTextFont = new wxFont( 10 + ,wxMODERN + ,wxNORMAL + ,wxNORMAL + ); + SetFont(*pTextFont); + SetSize( rPos.x + ,rPos.y + ,rSize.x + ,rSize.y + ); + delete pTextFont; + return TRUE; +} // end of wxStaticBox::Create + +wxSize wxStaticBox::DoGetBestSize() const { - // TODO -} + int nCx; + int nCy; + int wBox; + + wxGetCharSize( GetHWND() + ,&nCx + ,&nCy + ,(wxFont*)&GetFont() + ); + GetTextExtent( wxGetWindowText(m_hWnd) + ,&wBox + ,&nCy + ); + wBox += 3 * nCx; -void wxStaticBox::SetSize(int x, int y, int width, int height, int sizeFlags) + int hBox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nCy); + + return wxSize( wBox + ,hBox + ); +} // end of wxStaticBox::DoGetBestSize + +MRESULT wxStaticBox::OS2WindowProc( + WXUINT nMsg +, WXWPARAM wParam +, WXLPARAM lParam +) { - // TODO -} + return wxControl::OS2WindowProc(nMsg, wParam, lParam); +} // end of wxStaticBox::OS2WindowProc +