projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compilation fix: wxGenericCollapsiblePane needs wxButton and wxStaticLine
[wxWidgets.git]
/
include
/
wx
/
msw
/
tbar95.h
diff --git
a/include/wx/msw/tbar95.h
b/include/wx/msw/tbar95.h
index 7b1cd37dccf0d3e3f76f88d7852c5f056f1b6705..daa168e3d63a4d0828abb4d64f0f34e7a9e612be 100644
(file)
--- a/
include/wx/msw/tbar95.h
+++ b/
include/wx/msw/tbar95.h
@@
-12,10
+12,6
@@
#ifndef _WX_MSW_TBAR95_H_
#define _WX_MSW_TBAR95_H_
#ifndef _WX_MSW_TBAR95_H_
#define _WX_MSW_TBAR95_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "tbar95.h"
-#endif
-
#if wxUSE_TOOLBAR
#include "wx/dynarray.h"
#if wxUSE_TOOLBAR
#include "wx/dynarray.h"
@@
-74,6
+70,11
@@
public:
static WXHBITMAP MapBitmap(WXHBITMAP bitmap, int width, int height);
static WXHBITMAP MapBitmap(WXHBITMAP bitmap, int width, int height);
+ // override WndProc mainly to process WM_SIZE
+ virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+
+ virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+
protected:
// common part of all ctors
void Init();
protected:
// common part of all ctors
void Init();
@@
-102,12
+103,8
@@
protected:
const wxString& longHelp);
virtual wxToolBarToolBase *CreateTool(wxControl *control);
const wxString& longHelp);
virtual wxToolBarToolBase *CreateTool(wxControl *control);
- // override WndProc mainly to process WM_SIZE
- virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-
// return the appropriate size and flags for the toolbar control
virtual wxSize DoGetBestSize() const;
// return the appropriate size and flags for the toolbar control
virtual wxSize DoGetBestSize() const;
- virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
// handlers for various events
bool HandleSize(WXWPARAM wParam, WXLPARAM lParam);
// handlers for various events
bool HandleSize(WXWPARAM wParam, WXLPARAM lParam);
@@
-121,6
+118,9
@@
protected:
// unneeded
void CreateDisabledImageList();
// unneeded
void CreateDisabledImageList();
+ // get the Windows toolbar style of this control
+ long GetMSWToolbarStyle() const;
+
// the big bitmap containing all bitmaps of the toolbar buttons
WXHBITMAP m_hBitmap;
// the big bitmap containing all bitmaps of the toolbar buttons
WXHBITMAP m_hBitmap;