fixes for page positioning for notebooks with wxNB_MULTILINE style (closes bugs 70909...

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

diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index f150ee844b97448e8a2f39699e5ed00d6cc2e628..9821e4a385d65103f2db36795c11a7351f2c62bd 100644 (file)
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

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


@@ -30,52 +30,119 @@
 
 #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)
 
 
 #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 wxString& name)
+bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id,
+    const wxBitmap& bitmap,
+    const wxPoint& pos,
+    const wxSize& size, long style,
+    const wxValidator& wxVALIDATOR_PARAM(validator),
+    const wxString& name)

 {
 {

-  m_bmpNormal = bitmap;
-  SetName(name);
+    m_bmpNormal = bitmap;
+    SetName(name);

 
 #if wxUSE_VALIDATORS
 
 #if wxUSE_VALIDATORS

-  SetValidator(validator);
+    SetValidator(validator);

 #endif // wxUSE_VALIDATORS
 
 #endif // wxUSE_VALIDATORS
 

-  parent->AddChild(this);
+    parent->AddChild(this);

 
 

-  m_backgroundColour = parent->GetBackgroundColour();
-  m_foregroundColour = parent->GetForegroundColour();
-  m_windowStyle = style;
+    m_backgroundColour = parent->GetBackgroundColour();
+    m_foregroundColour = parent->GetForegroundColour();
+    m_windowStyle = style;

 
 

-  if ( style & wxBU_AUTODRAW )
-  {
-    m_marginX = wxDEFAULT_BUTTON_MARGIN;
-    m_marginY = wxDEFAULT_BUTTON_MARGIN;
-  }
+    if ( style & wxBU_AUTODRAW )
+    {
+        m_marginX = wxDEFAULT_BUTTON_MARGIN;
+        m_marginY = wxDEFAULT_BUTTON_MARGIN;
+    }

 
 

-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
+    int x = pos.x;
+    int y = pos.y;
+    int width = size.x;
+    int height = size.y;

 
 

-  if (id == -1)
-    m_windowId = NewControlId();
-  else
-    m_windowId = id;
+    if (id == -1)
+        m_windowId = NewControlId();
+    else
+        m_windowId = id;

 
 

-  if ( width == -1 && bitmap.Ok())
-    width = bitmap.GetWidth() + 2*m_marginX;
+    if ( width == -1 && bitmap.Ok())
+        width = bitmap.GetWidth() + 2*m_marginX;

 
 

-  if ( height == -1 && bitmap.Ok())
-    height = bitmap.GetHeight() + 2*m_marginY;
+    if ( height == -1 && bitmap.Ok())
+        height = bitmap.GetHeight() + 2*m_marginY;

 
 

-       long msStyle = WS_VISIBLE | WS_TABSTOP | WS_CHILD | BS_OWNERDRAW ;
+    long msStyle = WS_VISIBLE | WS_TABSTOP | WS_CHILD | BS_OWNERDRAW ;

 
     if ( m_windowStyle & wxCLIP_SIBLINGS )
         msStyle |= WS_CLIPSIBLINGS;
 
     if ( m_windowStyle & wxCLIP_SIBLINGS )
         msStyle |= WS_CLIPSIBLINGS;


@@ -91,8 +158,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
         msStyle |= BS_BOTTOM;
 #endif
 
         msStyle |= BS_BOTTOM;
 #endif
 

-  m_hWnd = (WXHWND)CreateWindowEx
-                   (
+    m_hWnd = (WXHWND) CreateWindowEx(

                     0,
                     wxT("BUTTON"),
                     wxEmptyString,
                     0,
                     wxT("BUTTON"),
                     wxEmptyString,


@@ -104,14 +170,14 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
                     NULL
                    );
 
                     NULL
                    );
 

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

 
 

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

 
 

-  SetSize(x, y, width, height);
+    SetSize(x, y, width, height);

 
 

-  return TRUE;
+    return true;

 }
 
 // VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN
 }
 
 // VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN


@@ -119,13 +185,13 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
 
 bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 {
 
 bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 {

-#if defined(__WIN95__)
+#ifndef __WXWINCE__

     long style = GetWindowLong((HWND) GetHWND(), GWL_STYLE);
     if (style & BS_BITMAP)
     {
         // Let default procedure draw the bitmap, which is defined
         // in the Windows resource.
     long style = GetWindowLong((HWND) GetHWND(), GWL_STYLE);
     if (style & BS_BITMAP)
     {
         // Let default procedure draw the bitmap, which is defined
         // in the Windows resource.

-        return FALSE;
+        return false;

     }
 #endif
 
     }
 #endif
 


@@ -149,7 +215,7 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
         bitmap = &m_bmpNormal;
 
     if ( !bitmap->Ok() )
         bitmap = &m_bmpNormal;
 
     if ( !bitmap->Ok() )

-        return FALSE;
+        return false;

 
     // centre the bitmap in the control area
     int x      = lpDIS->rcItem.left;
 
     // centre the bitmap in the control area
     int x      = lpDIS->rcItem.left;


@@ -159,8 +225,8 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
     int wBmp   = bitmap->GetWidth();
     int hBmp   = bitmap->GetHeight();
 
     int wBmp   = bitmap->GetWidth();
     int hBmp   = bitmap->GetHeight();
 

-       int x1,y1;
-       
+    int x1,y1;
+

     if(m_windowStyle & wxBU_LEFT)
         x1 = x + (FOCUS_MARGIN+1);
     else if(m_windowStyle & wxBU_RIGHT)
     if(m_windowStyle & wxBU_LEFT)
         x1 = x + (FOCUS_MARGIN+1);
     else if(m_windowStyle & wxBU_RIGHT)


@@ -192,8 +258,8 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 
     // draw the bitmap
     wxDC dst;
 
     // draw the bitmap
     wxDC dst;

-    dst.SetHDC((WXHDC) hDC, FALSE);
-    dst.DrawBitmap(*bitmap, x1, y1, TRUE);
+    dst.SetHDC((WXHDC) hDC, false);
+    dst.DrawBitmap(*bitmap, x1, y1, true);

 
     // draw focus / disabled state, if auto-drawing
     if ( (state & ODS_DISABLED) && autoDraw )
 
     // draw focus / disabled state, if auto-drawing
     if ( (state & ODS_DISABLED) && autoDraw )


@@ -201,7 +267,7 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
         DrawButtonDisable((WXHDC) hDC,
                           lpDIS->rcItem.left, lpDIS->rcItem.top,
                           lpDIS->rcItem.right, lpDIS->rcItem.bottom,
         DrawButtonDisable((WXHDC) hDC,
                           lpDIS->rcItem.left, lpDIS->rcItem.top,
                           lpDIS->rcItem.right, lpDIS->rcItem.bottom,

-                          TRUE);
+                          true);

     }
     else if ( (state & ODS_FOCUS) && autoDraw )
     {
     }
     else if ( (state & ODS_FOCUS) && autoDraw )
     {


@@ -213,14 +279,15 @@ bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
                         isSelected);
     }
 
                         isSelected);
     }
 

-    return TRUE;
+    return true;

 }
 
 // GRG Feb/2000, support for bmp buttons with Win95/98 standard LNF
 
 #if defined(__WIN95__)
 
 }
 
 // GRG Feb/2000, support for bmp buttons with Win95/98 standard LNF
 
 #if defined(__WIN95__)
 

-void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel )
+void wxBitmapButton::DrawFace( WXHDC dc, int left, int top,
+    int right, int bottom, bool sel )

 {
     HPEN oldp;
     HPEN penHiLight;
 {
     HPEN oldp;
     HPEN penHiLight;


@@ -249,20 +316,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);


@@ -275,7 +343,8 @@ void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int botto
 
 #else
 
 
 #else
 

-void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel )
+void wxBitmapButton::DrawFace( WXHDC dc, int left, int top,
+    int right, int bottom, bool sel )

 {
     HPEN oldp;
     HPEN penBorder;
 {
     HPEN oldp;
     HPEN penBorder;


@@ -339,7 +408,8 @@ void wxBitmapButton::DrawFace( WXHDC dc, int left, int top, int right, int botto
 #endif // defined(__WIN95__)
 
 
 #endif // defined(__WIN95__)
 
 

-void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right, int bottom, bool sel )
+void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right,
+    int bottom, bool WXUNUSED(sel) )

 {
     RECT rect;
     rect.left = left;
 {
     RECT rect;
     rect.left = left;


@@ -353,21 +423,19 @@ void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right, in
     if ( sel )
         OffsetRect( &rect, 1, 1 );
 */
     if ( sel )
         OffsetRect( &rect, 1, 1 );
 */

-       (void)sel;
+

     DrawFocusRect( (HDC) dc, &rect );
 }
 
 extern HBRUSH wxDisableButtonBrush;
     DrawFocusRect( (HDC) dc, &rect );
 }
 
 extern HBRUSH wxDisableButtonBrush;

-void wxBitmapButton::DrawButtonDisable( WXHDC dc, int left, int top, int right, int bottom, bool with_marg )
+void wxBitmapButton::DrawButtonDisable( WXHDC dc, int left, int top, int right,
+    int bottom, bool with_marg )

 {
     HBRUSH  old = (HBRUSH) SelectObject( (HDC) dc, wxDisableButtonBrush );
 
 {
     HBRUSH  old = (HBRUSH) SelectObject( (HDC) dc, wxDisableButtonBrush );
 

-    // VZ: what's this?? there is no such ROP AFAIK
-#ifdef __SALFORDC__
-    DWORD dwRop = 0xFA0089L;
-#else
-    DWORD dwRop = 0xFA0089UL;
-#endif
+    // ROP for "dest |= pattern" operation -- as it doesn't have a standard
+    // name, give it our own
+    static const DWORD PATTERNPAINT = 0xFA0089UL;

 
     if ( with_marg )
     {
 
     if ( with_marg )
     {


@@ -377,7 +445,7 @@ void wxBitmapButton::DrawButtonDisable( WXHDC dc, int left, int top, int right,
         bottom -= 2 * m_marginY;
     }
 
         bottom -= 2 * m_marginY;
     }
 

-    ::PatBlt( (HDC) dc, left, top, right, bottom, dwRop);
+    ::PatBlt( (HDC) dc, left, top, right, bottom, PATTERNPAINT);

 
     ::SelectObject( (HDC) dc, old );
 }
 
     ::SelectObject( (HDC) dc, old );
 }