fixing osx_carbon

[wxWidgets.git] / src / os2 / checkbox.cpp

diff --git a/src/os2/checkbox.cpp b/src/os2/checkbox.cpp
index 258a9cc6c39bc0b89b2d57d92bd70dfe89eb7537..5462a84f7a1e447cbc6425e273d3916c33005953 100644 (file)
--- a/src/os2/checkbox.cpp
+++ b/src/os2/checkbox.cpp
@@ -1,117 +1,210 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        checkbox.cpp
+// Name:        src/os2/checkbox.cpp

 // Purpose:     wxCheckBox
 // Purpose:     wxCheckBox

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     04/01/98
+// Created:     10/13/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

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

-#ifdef __GNUG__
-#pragma implementation "checkbox.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #include "wx/checkbox.h"
 
 
 #include "wx/checkbox.h"
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
+#ifndef WX_PRECOMP
+    #include "wx/brush.h"
+    #include "wx/scrolwin.h"
+    #include "wx/dcscreen.h"
+    #include "wx/settings.h"

 #endif
 
 #endif
 

-// Single check box item
-bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
-           const wxPoint& pos,
-           const wxSize& size, long style,
-           const wxValidator& validator,
-           const wxString& name)
-{
-    SetName(name);
-    SetValidator(validator);
-    m_windowStyle = style;
+#include "wx/os2/private.h"

 
 

-    if (parent) parent->AddChild(this);
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------

 
 

-    if ( id == -1 )
-        m_windowId = NewControlId();
-    else
-        m_windowId = id;
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
+
+extern void  wxAssociateWinWithHandle( HWND         hWnd
+                                      ,wxWindowOS2* pWin
+                                     );

 
 

-    // TODO: create checkbox
+// ============================================================================
+// implementation
+// ============================================================================

 
 

-    return FALSE;
-}
+// ----------------------------------------------------------------------------
+// wxCheckBox
+// ----------------------------------------------------------------------------

 
 

-void wxCheckBox::SetLabel(const wxString& label)
+bool wxCheckBox::OS2Command( WXUINT WXUNUSED(uParam),
+                             WXWORD WXUNUSED(wId) )
+{
+    wxCommandEvent rEvent( wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId );
+    rEvent.SetInt(GetValue());
+    rEvent.SetEventObject(this);
+    ProcessCommand(rEvent);
+    return true;
+} // end of wxCheckBox::OS2Command
+
+bool wxCheckBox::Create(wxWindow* pParent,
+                        wxWindowID vId,
+                        const wxString& rsLabel,
+                        const wxPoint& rPos,
+                        const wxSize& rSize,
+                        long lStyle,
+                        const wxValidator& rValidator,
+                        const wxString& rsName )

 {
 {

-    // TODO
-}
+    if (!CreateControl( pParent
+                       ,vId
+                       ,rPos
+                       ,rSize
+                       ,lStyle
+                       ,rValidator
+                       ,rsName
+                      ))
+        return false;
+
+
+    long osStyle = BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE;
+
+    bool bOk = OS2CreateControl( wxT("BUTTON")
+                           ,osStyle
+                           ,rPos
+                           ,rSize
+                           ,rsLabel
+                           ,0
+                          );
+    m_backgroundColour = pParent->GetBackgroundColour();
+
+    LONG lColor = (LONG)m_backgroundColour.GetPixel();
+    ::WinSetPresParam( m_hWnd
+                      ,PP_BACKGROUNDCOLOR
+                      ,sizeof(LONG)
+                      ,(PVOID)&lColor
+                     );
+    wxAssociateWinWithHandle(m_hWnd, this);
+    return bOk;
+} // end of wxCheckBox::Create
+
+void wxCheckBox::SetLabel( const wxString& rsLabel )
+{
+    wxString  sLabel=::wxPMTextToLabel(rsLabel);
+    ::WinSetWindowText(GetHwnd(), sLabel.c_str());
+} // end of wxCheckBox::SetLabel

 
 

-void wxCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags)
+wxSize wxCheckBox::DoGetBestSize() const

 {
 {

-    // TODO
-}
+    // We should probably compute nCheckSize but it seems to be a constant
+    // independent of its label's font size and not made available by OS/2.
+    int      nCheckSize = RADIO_SIZE;
+    int      nWidthCheckbox;
+    int      nHeightCheckbox;
+    wxString sStr = wxGetWindowText(GetHWND());
+
+    if (!sStr.empty())
+    {
+        GetTextExtent( sStr
+                      ,&nWidthCheckbox
+                      ,&nHeightCheckbox
+                     );
+        nWidthCheckbox += nCheckSize;
+
+        if (nHeightCheckbox < nCheckSize)
+            nHeightCheckbox = nCheckSize;
+    }
+    else
+    {
+        nWidthCheckbox  = nCheckSize;
+        nHeightCheckbox = nCheckSize;
+    }

 
 

-void wxCheckBox::SetValue(bool val)
+    return wxSize( nWidthCheckbox, nHeightCheckbox );
+} // end of wxCheckBox::DoGetBestSize
+
+void wxCheckBox::SetValue( bool bValue )

 {
 {

-    // TODO
-}
+    ::WinSendMsg(GetHwnd(), BM_SETCHECK, (MPARAM)bValue, 0);
+} // end of wxCheckBox::SetValue
+
+#ifndef BST_CHECKED
+#define BST_CHECKED 0x0001
+#endif

 
 bool wxCheckBox::GetValue() const
 {
 
 bool wxCheckBox::GetValue() const
 {

-    // TODO
-    return FALSE;
-}
+    return((LONGFROMMR(::WinSendMsg(GetHwnd(), BM_QUERYCHECK, (MPARAM)0, (MPARAM)0)) == 1L));
+} // end of wxCheckBox::GetValue

 
 

-void wxCheckBox::Command (wxCommandEvent & event)
+void wxCheckBox::Command ( wxCommandEvent& rEvent )

 {
 {

-    SetValue ((event.GetInt() != 0));
-    ProcessCommand (event);
-}
-
-// Bitmap checkbox
-bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *label,
-           const wxPoint& pos,
-           const wxSize& size, long style,
-           const wxValidator& validator,
-           const wxString& name)
+    SetValue((rEvent.GetInt() != 0));
+    ProcessCommand(rEvent);
+} // end of wxCheckBox:: Command
+
+// ----------------------------------------------------------------------------
+// wxBitmapCheckBox
+// ----------------------------------------------------------------------------
+
+bool wxBitmapCheckBox::Create( wxWindow*          pParent,
+                               wxWindowID         vId,
+                               const wxBitmap*    WXUNUSED(pLabel),
+                               const wxPoint&     rPos,
+                               const wxSize&      rSize,
+                               long               lStyle,
+                               const wxValidator& rValidator,
+                               const wxString&    rsName)

 {
 {

-    SetName(name);
-    SetValidator(validator);
-    m_windowStyle = style;
+    SetName(rsName);
+#if wxUSE_VALIDATORS
+    SetValidator(rValidator);
+#endif
+    if (pParent)
+        pParent->AddChild(this);

 
 

-    if (parent) parent->AddChild(this);
+    SetBackgroundColour(pParent->GetBackgroundColour()) ;
+    SetForegroundColour(pParent->GetForegroundColour()) ;
+    m_windowStyle = lStyle;

 
 

-    if ( id == -1 )
+    if (vId == -1)

         m_windowId = NewControlId();
     else
         m_windowId = NewControlId();
     else

-        m_windowId = id;
+        m_windowId = vId;

 
 

-    // TODO: Create the bitmap checkbox
+    int                             nX      = rPos.x;
+    int                             nY      = rPos.y;
+    int                             nWidth  = rSize.x;
+    int                             nHeight = rSize.y;

 
 

-    return FALSE;
-}
+    m_nCheckWidth = -1 ;
+    m_nCheckHeight = -1 ;
+//    long msStyle = CHECK_FLAGS;

 
 

-void wxBitmapCheckBox::SetLabel(const wxBitmap& bitmap)
-{
-    // TODO
-}
+    HWND hButton = 0; // TODO: Create the bitmap checkbox

 
 

-void wxBitmapCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    // TODO
-}
+    m_hWnd = (WXHWND)hButton;

 
 

-void wxBitmapCheckBox::SetValue(bool val)
-{
-    // TODO
-}
+    //
+    // Subclass again for purposes of dialog editing mode
+    //
+    SubclassWin((WXHWND)hButton);

 
 

-bool wxBitmapCheckBox::GetValue() const
-{
-    // TODOD
-    return FALSE;
-}
+    SetSize( nX
+            ,nY
+            ,nWidth
+            ,nHeight
+           );

 
 

+    ::WinShowWindow(hButton, TRUE);
+    return true;
+} // end of wxBitmapCheckBox::Create

 
 

+void wxBitmapCheckBox::SetLabel( const wxBitmap& WXUNUSED(rBitmap) )
+{
+    wxFAIL_MSG(wxT("not implemented"));
+}  // end of wxBitmapCheckBox::SetLabel