fix for DMC missing mouse defines - linking of minimal failed

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

diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index 32d792972af1192df435b8216b26ab42dccf70d9..a91de899b4fb42bd42c393c9fad04b1300d5b383 100644 (file)
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -1,15 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        bmpbuttn.cpp
+// Name:        src/msw/bmpbuttn.cpp

 // Purpose:     wxBitmapButton
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Purpose:     wxBitmapButton
 // 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__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "bmpbuttn.h"
 #endif
 
 #pragma implementation "bmpbuttn.h"
 #endif
 


@@ -17,9 +17,11 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_BMPBUTTON
+

 #ifndef WX_PRECOMP
     #include "wx/bmpbuttn.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/bmpbuttn.h"
     #include "wx/log.h"


@@ -28,17 +30,83 @@
 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 

+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+#if wxUSE_EXTENDED_RTTI
+
+WX_DEFINE_FLAGS( wxBitmapButtonStyle )
+
+wxBEGIN_FLAGS( wxBitmapButtonStyle )
+    // 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(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxBU_AUTODRAW)
+    wxFLAGS_MEMBER(wxBU_LEFT)
+    wxFLAGS_MEMBER(wxBU_RIGHT)
+    wxFLAGS_MEMBER(wxBU_TOP)
+    wxFLAGS_MEMBER(wxBU_BOTTOM)
+wxEND_FLAGS( wxBitmapButtonStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxBitmapButton, wxButton,"wx/bmpbuttn.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxBitmapButton)
+    wxPROPERTY_FLAGS( WindowStyle , wxBitmapButtonStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxBitmapButton)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_5( wxBitmapButton , wxWindow* , Parent , wxWindowID , Id , wxBitmap , Bitmap , wxPoint , Position , wxSize , Size )
+
+#else

 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)

+#endif
+
+/*
+TODO PROPERTIES :
+
+long "style" , wxBU_AUTODRAW
+bool "default" , 0
+bitmap "selected" ,
+bitmap "focus" ,
+bitmap "disabled" ,
+*/

 
 #define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
 
 bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
            const wxPoint& pos,
            const wxSize& size, long style,
 
 #define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
 
 bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
            const wxPoint& pos,
            const wxSize& size, long style,

-           const wxValidator& validator,
+           const wxValidator& wxVALIDATOR_PARAM(validator),

            const wxString& name)
 {
            const wxString& name)
 {

-  m_buttonBitmap = bitmap;
+  m_bmpNormal = bitmap;

   SetName(name);
 
 #if wxUSE_VALIDATORS
   SetName(name);
 
 #if wxUSE_VALIDATORS


@@ -50,8 +118,6 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
   m_backgroundColour = parent->GetBackgroundColour();
   m_foregroundColour = parent->GetForegroundColour();
   m_windowStyle = style;
   m_backgroundColour = parent->GetBackgroundColour();
   m_foregroundColour = parent->GetForegroundColour();
   m_windowStyle = style;

-  m_marginX = 0;
-  m_marginY = 0;

 
   if ( style & wxBU_AUTODRAW )
   {
 
   if ( style & wxBU_AUTODRAW )
   {


@@ -95,7 +161,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
                    (
                     0,
                     wxT("BUTTON"),
                    (
                     0,
                     wxT("BUTTON"),

-                    wxT(""),
+                    wxEmptyString,

                     msStyle,
                     0, 0, 0, 0,
                     GetWinHwnd(parent),
                     msStyle,
                     0, 0, 0, 0,
                     GetWinHwnd(parent),


@@ -114,17 +180,12 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
   return TRUE;
 }
 
   return TRUE;
 }
 

-void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
-{
-  m_buttonBitmap = bitmap;
-}
-

 // VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN
 #define FOCUS_MARGIN 3
 
 bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 {
 // VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN
 #define FOCUS_MARGIN 3
 
 bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 {

-#if defined(__WIN95__)
+#ifndef __WXWINCE__

     long style = GetWindowLong((HWND) GetHWND(), GWL_STYLE);
     if (style & BS_BITMAP)
     {
     long style = GetWindowLong((HWND) GetHWND(), GWL_STYLE);
     if (style & BS_BITMAP)
     {


@@ -144,14 +205,14 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
     // choose the bitmap to use depending on the button state
     wxBitmap* bitmap;
 
     // choose the bitmap to use depending on the button state
     wxBitmap* bitmap;
 

-    if ( isSelected && m_buttonBitmapSelected.Ok() )
-        bitmap = &m_buttonBitmapSelected;
-    else if ((state & ODS_FOCUS) && m_buttonBitmapFocus.Ok())
-        bitmap = &m_buttonBitmapFocus;
-    else if ((state & ODS_DISABLED) && m_buttonBitmapDisabled.Ok())
-        bitmap = &m_buttonBitmapDisabled;
+    if ( isSelected && m_bmpSelected.Ok() )
+        bitmap = &m_bmpSelected;
+    else if ((state & ODS_FOCUS) && m_bmpFocus.Ok())
+        bitmap = &m_bmpFocus;
+    else if ((state & ODS_DISABLED) && m_bmpDisabled.Ok())
+        bitmap = &m_bmpDisabled;

     else
     else

-        bitmap = &m_buttonBitmap;
+        bitmap = &m_bmpNormal;

 
     if ( !bitmap->Ok() )
         return FALSE;
 
     if ( !bitmap->Ok() )
         return FALSE;


@@ -239,7 +300,10 @@ void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int botto
     penLight    = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DLIGHT));
     penShadow   = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DSHADOW));
     penDkShadow = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DDKSHADOW));
     penLight    = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DLIGHT));
     penShadow   = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DSHADOW));
     penDkShadow = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DDKSHADOW));

-    brushFace   = CreateSolidBrush(GetSysColor(COLOR_BTNFACE));
+    // brushFace   = CreateSolidBrush(GetSysColor(COLOR_BTNFACE));
+    // Taking the background colour fits in better with
+    // Windows XP themes.
+    brushFace   = CreateSolidBrush(m_backgroundColour.m_pixel);

 
     // draw the rectangle
     RECT rect;
 
     // draw the rectangle
     RECT rect;


@@ -251,20 +315,21 @@ void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int botto
 
     // draw the border
     oldp = (HPEN) SelectObject( (HDC) dc, sel? penDkShadow : penHiLight);
 
     // draw the border
     oldp = (HPEN) SelectObject( (HDC) dc, sel? penDkShadow : penHiLight);

-    MoveToEx((HDC) dc, left, top, NULL); LineTo((HDC) dc, right-1, top);
-    MoveToEx((HDC) dc, left, top+1, NULL); LineTo((HDC) dc, left, bottom-1);
+
+    wxDrawLine((HDC) dc, left, top, right-1, top);
+    wxDrawLine((HDC) dc, left, top+1, left, bottom-1);

 
     SelectObject( (HDC) dc, sel? penShadow : penLight);
 
     SelectObject( (HDC) dc, sel? penShadow : penLight);

-    MoveToEx((HDC) dc, left+1, top+1, NULL); LineTo((HDC) dc, right-2, top+1);
-    MoveToEx((HDC) dc, left+1, top+2, NULL); LineTo((HDC) dc, left+1, bottom-2);
+    wxDrawLine((HDC) dc, left+1, top+1, right-2, top+1);
+    wxDrawLine((HDC) dc, left+1, top+2, left+1, bottom-2);

 
     SelectObject( (HDC) dc, sel? penLight : penShadow);
 
     SelectObject( (HDC) dc, sel? penLight : penShadow);

-    MoveToEx((HDC) dc, left+1, bottom-2, NULL); LineTo((HDC) dc, right-1, bottom-2);
-    MoveToEx((HDC) dc, right-2, bottom-3, NULL); LineTo((HDC) dc, right-2, top);
+    wxDrawLine((HDC) dc, left+1, bottom-2, right-1, bottom-2);
+    wxDrawLine((HDC) dc, right-2, bottom-3, right-2, top);

 
     SelectObject( (HDC) dc, sel? penHiLight : penDkShadow);
 
     SelectObject( (HDC) dc, sel? penHiLight : penDkShadow);

-    MoveToEx((HDC) dc, left, bottom-1, NULL); LineTo((HDC) dc, right+2, bottom-1);
-    MoveToEx((HDC) dc, right-1, bottom-2, NULL); LineTo((HDC) dc, right-1, top-1);
+    wxDrawLine((HDC) dc, left, bottom-1, right+2, bottom-1);
+    wxDrawLine((HDC) dc, right-1, bottom-2, right-1, top-1);

 
     // delete allocated resources
     SelectObject((HDC) dc,oldp);
 
     // delete allocated resources
     SelectObject((HDC) dc,oldp);


@@ -388,3 +453,5 @@ void wxBitmapButton::SetDefault()
 {
     wxButton::SetDefault();
 }
 {
     wxButton::SetDefault();
 }

+
+#endif // wxUSE_BMPBUTTON