wxMac should use /src/mac/carbon/spinctrl.cpp, applied some sizing

[wxWidgets.git] / include / wx / msw / tbar95.h

diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index 45c82b48d2c922a288c1a37370895202a9fcfb1a..03cb30b65769e940fea1881c6a006e2241edf106 100644 (file)
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TBAR95_H_
 #define _WX_TBAR95_H_
 
 #ifndef _WX_TBAR95_H_
 #define _WX_TBAR95_H_
 

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

     #pragma interface "tbar95.h"
 #endif
 
     #pragma interface "tbar95.h"
 #endif
 


@@ -60,18 +60,28 @@ public:
     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------
 

+    virtual void SetWindowStyleFlag(long style);
+

     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
 
     void OnMouseEvent(wxMouseEvent& event);
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
 
     void OnMouseEvent(wxMouseEvent& event);
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 

+    void SetFocus() {}
+

     static WXHBITMAP MapBitmap(WXHBITMAP bitmap, int width, int height);
 
 protected:
     // common part of all ctors
     void Init();
 
     static WXHBITMAP MapBitmap(WXHBITMAP bitmap, int width, int height);
 
 protected:
     // common part of all ctors
     void Init();
 

+    // create the native toolbar control
+    bool MSWCreateToolbar(const wxPoint& pos, const wxSize& size);
+
+    // recreate the control completely
+    void Recreate();
+

     // implement base class pure virtuals
     virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
     virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
     // implement base class pure virtuals
     virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
     virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);


@@ -90,17 +100,21 @@ protected:
                                           const wxString& longHelp);
     virtual wxToolBarToolBase *CreateTool(wxControl *control);
 
                                           const wxString& longHelp);
     virtual wxToolBarToolBase *CreateTool(wxControl *control);
 

-    // should be called whenever the toolbar size changes
-    void UpdateSize();
-

     // override WndProc mainly to process WM_SIZE
     // override WndProc mainly to process WM_SIZE

-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+
+    // 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);
     bool HandlePaint(WXWPARAM wParam, WXLPARAM lParam);
     void HandleMouseMove(WXWPARAM wParam, WXLPARAM lParam);
 
 
     // handlers for various events
     bool HandleSize(WXWPARAM wParam, WXLPARAM lParam);
     bool HandlePaint(WXWPARAM wParam, WXLPARAM lParam);
     void HandleMouseMove(WXWPARAM wParam, WXLPARAM lParam);
 

+    // should be called whenever the toolbar size changes
+    void UpdateSize();
+

     // 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;
 


@@ -113,6 +127,7 @@ protected:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)

+    DECLARE_NO_COPY_CLASS(wxToolBar)

 };
 
 #endif // wxUSE_TOOLBAR
 };
 
 #endif // wxUSE_TOOLBAR