cw makefile for minimal - to be used as template

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

diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index 6f63ec57b4b6c7c43391f09c01d486faaef18c76..f49f7a857d7fb9ed4993c01763537644c150e9f2 100644 (file)
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -98,8 +98,8 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
   SetValidator(val);
 
   parent->AddChild(this);
   SetValidator(val);
 
   parent->AddChild(this);

-  m_backgroundColour = parent->GetDefaultBackgroundColour() ;
-  m_foregroundColour = parent->GetDefaultForegroundColour() ;
+  m_backgroundColour = parent->GetBackgroundColour() ;
+  m_foregroundColour = parent->GetForegroundColour() ;

 
   m_windowStyle = (long&)style;
 
 
   m_windowStyle = (long&)style;
 


@@ -125,27 +125,36 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
   WXDWORD exStyle = Determine3DEffects(0, &want3D) ;
   // Even with extended styles, need to combine with WS_BORDER
   // for them to look right.
   WXDWORD exStyle = Determine3DEffects(0, &want3D) ;
   // Even with extended styles, need to combine with WS_BORDER
   // for them to look right.

-  if (want3D && ((m_windowStyle & wxSIMPLE_BORDER) || (m_windowStyle & wxRAISED_BORDER) ||
-       (m_windowStyle & wxSUNKEN_BORDER) || (m_windowStyle & wxDOUBLE_BORDER)))
+/*
+  if ( want3D || wxStyleHasBorder(m_windowStyle) )

     msStyle |= WS_BORDER;
     msStyle |= WS_BORDER;

+*/

 
 
 
 

-  m_hWnd = (WXHWND) CreateWindowEx((DWORD) exStyle, GROUP_CLASS, (title == "" ? NULL : (const char *)title),
-                           msStyle,
-                           0,0,0,0,
-                           (HWND) parent->GetHWND(), (HMENU) m_windowId, wxGetInstance(), NULL) ;
-

   HWND the_handle = (HWND) parent->GetHWND() ;
 
   HWND the_handle = (HWND) parent->GetHWND() ;
 

+  m_hWnd = (WXHWND)::CreateWindowEx
+                     (
+                      (DWORD)exStyle,
+                      GROUP_CLASS,
+                      title,
+                      msStyle,
+                      0, 0, 0, 0,
+                      the_handle,
+                      (HMENU)m_windowId,
+                      wxGetInstance(),
+                      NULL
+                     );
+

 #if CTL3D
   if (want3D)
   {
 #if CTL3D
   if (want3D)
   {

-    Ctl3dSubclassCtl((HWND) m_hWnd);
-       m_useCtl3D = TRUE;
+    Ctl3dSubclassCtl((HWND)m_hWnd);
+    m_useCtl3D = TRUE;

   }
 #endif
 
   }
 #endif
 

-  SetFont(* parent->GetFont());
+  SetFont(parent->GetFont());

 
   SubclassWin((WXHWND)m_hWnd);
 
 
   SubclassWin((WXHWND)m_hWnd);
 


@@ -171,13 +180,13 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
   if (want3D)
   {
     Ctl3dSubclassCtl((HWND) m_hWnd);
   if (want3D)
   {
     Ctl3dSubclassCtl((HWND) m_hWnd);

-       m_useCtl3D = TRUE;
+   m_useCtl3D = TRUE;

   }
 #endif
   }
 #endif

-    if (GetFont())
+    if (GetFont().Ok())

     {
        SendMessage((HWND)m_radioButtons[i],WM_SETFONT,
     {
        SendMessage((HWND)m_radioButtons[i],WM_SETFONT,

-                    (WPARAM)GetFont()->GetResourceHandle(),0L);
+                    (WPARAM)GetFont().GetResourceHandle(),0L);

     }
     m_subControls.Append((wxObject *)newId);
   }
     }
     m_subControls.Append((wxObject *)newId);
   }


@@ -207,8 +216,8 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
   SetValidator(val);
 
   parent->AddChild(this);
   SetValidator(val);
 
   parent->AddChild(this);

-  m_backgroundColour = parent->GetDefaultBackgroundColour() ;
-  m_foregroundColour = parent->GetDefaultForegroundColour() ;
+  m_backgroundColour = parent->GetBackgroundColour() ;
+  m_foregroundColour = parent->GetForegroundColour() ;

 
   m_windowStyle = (long&)style;
 
 
   m_windowStyle = (long&)style;
 


@@ -235,8 +244,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
   WXDWORD exStyle = Determine3DEffects(0, &want3D) ;
   // Even with extended styles, need to combine with WS_BORDER
   // for them to look right.
   WXDWORD exStyle = Determine3DEffects(0, &want3D) ;
   // Even with extended styles, need to combine with WS_BORDER
   // for them to look right.

-  if (want3D && ((m_windowStyle & wxSIMPLE_BORDER) || (m_windowStyle & wxRAISED_BORDER) ||
-       (m_windowStyle & wxSUNKEN_BORDER) || (m_windowStyle & wxDOUBLE_BORDER)))
+  if ( want3D || wxStyleHasBorder(m_windowStyle) )

     msStyle |= WS_BORDER;
 
   m_hWnd = (WXHWND) CreateWindowEx((DWORD) exStyle, GROUP_CLASS, (title == "" ? NULL : (const char *)title),
     msStyle |= WS_BORDER;
 
   m_hWnd = (WXHWND) CreateWindowEx((DWORD) exStyle, GROUP_CLASS, (title == "" ? NULL : (const char *)title),


@@ -250,11 +258,11 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
   if (want3D)
   {
     Ctl3dSubclassCtl((HWND) m_hWnd);
   if (want3D)
   {
     Ctl3dSubclassCtl((HWND) m_hWnd);

-       m_useCtl3D = TRUE;
+   m_useCtl3D = TRUE;

   }
 #endif
 
   }
 #endif
 

-  SetFont(* parent->GetFont());
+  SetFont(parent->GetFont());

 
   // Subclass again for purposes of dialog editing mode
   SubclassWin((WXHWND)m_hWnd);
 
   // Subclass again for purposes of dialog editing mode
   SubclassWin((WXHWND)m_hWnd);


@@ -283,7 +291,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
   if (want3D)
   {
     Ctl3dSubclassCtl((HWND) m_hWnd);
   if (want3D)
   {
     Ctl3dSubclassCtl((HWND) m_hWnd);

-       m_useCtl3D = TRUE;
+   m_useCtl3D = TRUE;

   }
 #endif
     m_subControls.Append((wxObject *)newId);
   }
 #endif
     m_subControls.Append((wxObject *)newId);


@@ -399,7 +407,7 @@ void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
   int current_width, cyf;
 
   int cx1,cy1 ;
   int current_width, cyf;
 
   int cx1,cy1 ;

-  wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont());
+  wxGetCharSize(m_hWnd, &cx1, &cy1, & GetFont());

   // Attempt to have a look coherent with other platforms:
   // We compute the biggest toggle dim, then we align all
   // items according this value.
   // Attempt to have a look coherent with other platforms:
   // We compute the biggest toggle dim, then we align all
   // items according this value.


@@ -415,7 +423,7 @@ void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
     {
       // It's a labelled toggle
       GetWindowText((HWND) m_radioButtons[i], buf, 300);
     {
       // It's a labelled toggle
       GetWindowText((HWND) m_radioButtons[i], buf, 300);

-      GetTextExtent(buf, &current_width, &cyf,NULL,NULL, GetFont());
+      GetTextExtent(buf, &current_width, &cyf,NULL,NULL, & GetFont());

       eachWidth = (int)(current_width + RADIO_SIZE);
       eachHeight = (int)((3*cyf)/2);
     }
       eachWidth = (int)(current_width + RADIO_SIZE);
       eachHeight = (int)((3*cyf)/2);
     }


@@ -435,7 +443,7 @@ void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
 
     int nbHor,nbVer;
 
 
     int nbHor,nbVer;
 

-    if (m_windowStyle & wxRA_HORIZONTAL)
+    if (m_windowStyle & wxRA_VERTICAL)

     {
       nbVer = m_majorDim ;
       nbHor = (m_noItems+m_majorDim-1)/m_majorDim ;
     {
       nbVer = m_majorDim ;
       nbHor = (m_noItems+m_majorDim-1)/m_majorDim ;


@@ -476,7 +484,7 @@ void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
     // Bidimensional radio adjustment
     if (i&&((i%m_majorDim)==0)) // Why is this omitted for i = 0?
     {
     // Bidimensional radio adjustment
     if (i&&((i%m_majorDim)==0)) // Why is this omitted for i = 0?
     {

-      if (m_windowStyle & wxRA_HORIZONTAL)
+      if (m_windowStyle & wxRA_VERTICAL)

       {
         y_offset = startY;
         x_offset += maxWidth + cx1 ;
       {
         y_offset = startY;
         x_offset += maxWidth + cx1 ;


@@ -495,7 +503,7 @@ void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
     {
       // It's a labeled item
       GetWindowText((HWND) m_radioButtons[i], buf, 300);
     {
       // It's a labeled item
       GetWindowText((HWND) m_radioButtons[i], buf, 300);

-      GetTextExtent(buf, &current_width, &cyf,NULL,NULL,GetFont());
+      GetTextExtent(buf, &current_width, &cyf,NULL,NULL, & GetFont());

 
       // How do we find out radio button bitmap size!!
       // By adjusting them carefully, manually :-)
 
       // How do we find out radio button bitmap size!!
       // By adjusting them carefully, manually :-)


@@ -509,7 +517,7 @@ void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
     }
 
     MoveWindow((HWND) m_radioButtons[i],x_offset,y_offset,eachWidth,eachHeight,TRUE);
     }
 
     MoveWindow((HWND) m_radioButtons[i],x_offset,y_offset,eachWidth,eachHeight,TRUE);

-    if (m_windowStyle & wxRA_HORIZONTAL)
+    if (m_windowStyle & wxRA_VERTICAL)

     {
       y_offset += maxHeight;
       if (m_radioWidth[0]>0)
     {
       y_offset += maxHeight;
       if (m_radioWidth[0]>0)


@@ -651,7 +659,7 @@ void wxRadioBox::Show(int item, bool show)
 }
 
 WXHBRUSH wxRadioBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
 }
 
 WXHBRUSH wxRadioBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,

-                       WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+      WXUINT message, WXWPARAM wParam, WXLPARAM lParam)

 {
 #if CTL3D
   if ( m_useCtl3D )
 {
 #if CTL3D
   if ( m_useCtl3D )


@@ -701,11 +709,11 @@ bool wxRadioBox::SetStringSelection (const wxString& s)
 
 bool wxRadioBox::ContainsHWND(WXHWND hWnd) const
 {
 
 bool wxRadioBox::ContainsHWND(WXHWND hWnd) const
 {

-       int i;
+  int i;

     for (i = 0; i < Number(); i++)
        if (GetRadioButtons()[i] == hWnd)
           return TRUE;
     for (i = 0; i < Number(); i++)
        if (GetRadioButtons()[i] == hWnd)
           return TRUE;

-       return FALSE;
+  return FALSE;

 }
 
 void wxRadioBox::Command (wxCommandEvent & event)
 }
 
 void wxRadioBox::Command (wxCommandEvent & event)


@@ -716,7 +724,7 @@ void wxRadioBox::Command (wxCommandEvent & event)
 
 long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
 
 long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {

-       if (nMsg == WM_NCHITTEST)
+  if (nMsg == WM_NCHITTEST)

     {
         int xPos = LOWORD(lParam);  // horizontal position of cursor
         int yPos = HIWORD(lParam);  // vertical position of cursor
     {
         int xPos = LOWORD(lParam);  // horizontal position of cursor
         int yPos = HIWORD(lParam);  // vertical position of cursor


@@ -729,6 +737,6 @@ long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
             return (long)HTCLIENT;
     }
 
             return (long)HTCLIENT;
     }
 

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

 }
 
 }