X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f15b49521a67a10b47374c04723d5534a131dcb0..01cb1c26171efc494b94d77e4351362bb0eb2e7d:/src/os2/stattext.cpp?ds=sidebyside diff --git a/src/os2/stattext.cpp b/src/os2/stattext.cpp index 141ccf59a3..167caa3e86 100644 --- a/src/os2/stattext.cpp +++ b/src/os2/stattext.cpp @@ -20,6 +20,7 @@ #include "wx/event.h" #include "wx/app.h" #include "wx/brush.h" +#include "wx/scrolwin.h" #endif #include "wx/stattext.h" @@ -80,10 +81,35 @@ bool wxStaticText::Create( wxCHECK_MSG(m_hWnd, FALSE, wxT("Failed to create static ctrl")); + wxColour vColour; + + vColour.Set(wxString("BLACK")); + + LONG lColor = (LONG)vColour.GetPixel(); + + ::WinSetPresParam( m_hWnd + ,PP_FOREGROUNDCOLOR + ,sizeof(LONG) + ,(PVOID)&lColor + ); + lColor = (LONG)m_backgroundColour.GetPixel(); + + ::WinSetPresParam( m_hWnd + ,PP_BACKGROUNDCOLOR + ,sizeof(LONG) + ,(PVOID)&lColor + ); + SubclassWin(m_hWnd); - wxControl::SetFont(pParent->GetFont()); - SetSize(nX, nY, nWidth, nHeight); - return FALSE; + SetFont(*wxSMALL_FONT); + SetXComp(0); + SetYComp(0); + SetSize( nX + ,nY + ,nWidth + ,nHeight + ); + return TRUE; } // end of wxStaticText::Create wxSize wxStaticText::DoGetBestSize() const @@ -96,7 +122,7 @@ wxSize wxStaticText::DoGetBestSize() const int nHeightLine = 0; wxString sCurLine; - for ( const wxChar *pc = sText; ; pc++ ) + for (const wxChar *pc = sText; ; pc++) { if ( *pc == wxT('\n') || *pc == wxT('\0') ) { @@ -143,22 +169,26 @@ wxSize wxStaticText::DoGetBestSize() const ); } // end of wxStaticText::DoGetBestSize -void wxStaticText::SetLabel( - const wxString& rsLabel +void wxStaticText::DoSetSize( + int nX +, int nY +, int nWidth +, int nHeight +, int nSizeFlags ) { - ::WinSetWindowText(GetHwnd(), rsLabel.c_str()); - // - // Adjust the size of the window to fit to the label unless autoresizing is - // disabled + // We need to refresh the window after changing its size as the standard + // control doesn't always update itself properly. // - if (!(GetWindowStyle() & wxST_NO_AUTORESIZE)) - { - DoSetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT); - } - DoSetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT); -} // end of wxStaticText::SetLabel + wxStaticTextBase::DoSetSize( nX + ,nY + ,nWidth + ,nHeight + ,nSizeFlags + ); + Refresh(); +} // end of wxStaticText::DoSetSize bool wxStaticText::SetFont( const wxFont& rFont @@ -177,6 +207,32 @@ bool wxStaticText::SetFont( return bRet; } // end of wxStaticText::SetFont +void wxStaticText::SetLabel( + const wxString& rsLabel +) +{ + ::WinSetWindowText(GetHwnd(), rsLabel.c_str()); + + // + // Adjust the size of the window to fit to the label unless autoresizing is + // disabled + // + if (!(GetWindowStyle() & wxST_NO_AUTORESIZE)) + { + wxCoord vX; + wxCoord vY; + wxCoord vWidth; + wxCoord vHeight; + + GetPosition(&vX, &vY); + GetSize(&vWidth, &vHeight); + if (!(vX == -1 && vY == -1 && vWidth == -1 && vHeight == -1)) + DoSetSize(vX, vY, vWidth, vHeight, wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT); + else + DoSetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH | wxSIZE_AUTO_HEIGHT); + } +} // end of wxStaticText::SetLabel + MRESULT wxStaticText::OS2WindowProc( WXUINT uMsg , WXWPARAM wParam @@ -188,5 +244,3 @@ MRESULT wxStaticText::OS2WindowProc( ,lParam ); } // end of wxStaticText::OS2WindowProc - -