Don't create multiple parent-less top level frames in layout sample.

[wxWidgets.git] / include / wx / msw / wince / tbarwce.h

diff --git a/include/wx/msw/wince/tbarwce.h b/include/wx/msw/wince/tbarwce.h
index bcf66439ca220973c62493bf1f4d8206c7124f6a..9e7eb0cc27b31f7572d81cb54c1f99acc20dacbc 100644 (file)
--- a/include/wx/msw/wince/tbarwce.h
+++ b/include/wx/msw/wince/tbarwce.h
@@ -12,10 +12,6 @@
 #ifndef _WX_BARWCE_H_
 #define _WX_BARWCE_H_
 
 #ifndef _WX_BARWCE_H_
 #define _WX_BARWCE_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "tbarwce.h"
-#endif
-

 #if wxUSE_TOOLBAR
 
 #include "wx/dynarray.h"
 #if wxUSE_TOOLBAR
 
 #include "wx/dynarray.h"


@@ -23,7 +19,7 @@
 // Smartphones don't have toolbars, so use a dummy class
 #ifdef __SMARTPHONE__
 
 // Smartphones don't have toolbars, so use a dummy class
 #ifdef __SMARTPHONE__
 

-class WXDLLEXPORT wxToolBar : public wxToolBarBase
+class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase

 {
 public:
     // ctors and dtor
 {
 public:
     // ctors and dtor


@@ -33,7 +29,7 @@ public:
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,

-                long style = wxNO_BORDER | wxTB_HORIZONTAL,
+                long style = wxTB_HORIZONTAL,

                 const wxString& name = wxToolBarNameStr)
     {
         Create(parent, id, pos, size, style, name);
                 const wxString& name = wxToolBarNameStr)
     {
         Create(parent, id, pos, size, style, name);


@@ -43,7 +39,7 @@ public:
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,

-                long style = wxNO_BORDER | wxTB_HORIZONTAL,
+                long style = wxTB_HORIZONTAL,

                 const wxString& name = wxToolBarNameStr);
 
     // override/implement base class virtuals
                 const wxString& name = wxToolBarNameStr);
 
     // override/implement base class virtuals


@@ -67,21 +63,22 @@ protected:
                                           wxObject *clientData,
                                           const wxString& shortHelp,
                                           const wxString& longHelp);
                                           wxObject *clientData,
                                           const wxString& shortHelp,
                                           const wxString& longHelp);

-    virtual wxToolBarToolBase *CreateTool(wxControl *control);
+    virtual wxToolBarToolBase *CreateTool(wxControl *control,
+                                          const wxString& label);

 
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)

-    DECLARE_NO_COPY_CLASS(wxToolBar)
+    wxDECLARE_NO_COPY_CLASS(wxToolBar);

 };
 
 #else
 
 // For __POCKETPC__
 
 };
 
 #else
 
 // For __POCKETPC__
 

-#include "wx/msw/tbar95.h"
+#include "wx/msw/toolbar.h"

 
 

-class WXDLLEXPORT wxToolMenuBar : public wxToolBar
+class WXDLLIMPEXP_CORE wxToolMenuBar : public wxToolBar

 {
 public:
     // ctors and dtor
 {
 public:
     // ctors and dtor


@@ -91,7 +88,7 @@ public:
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,

-                long style = wxNO_BORDER | wxTB_HORIZONTAL,
+                long style = wxTB_HORIZONTAL,

                 const wxString& name = wxToolBarNameStr,
                 wxMenuBar* menuBar = NULL)
     {
                 const wxString& name = wxToolBarNameStr,
                 wxMenuBar* menuBar = NULL)
     {


@@ -104,7 +101,7 @@ public:
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,

-                long style = wxNO_BORDER | wxTB_HORIZONTAL,
+                long style = wxTB_HORIZONTAL,

                 const wxString& name = wxToolBarNameStr,
                 wxMenuBar* menuBar = NULL);
 
                 const wxString& name = wxToolBarNameStr,
                 wxMenuBar* menuBar = NULL);
 


@@ -116,6 +113,9 @@ public:
     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------
 

+    // Override in order to bypass wxToolBar's overridden function
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+

     virtual bool MSWCommand(WXUINT param, WXWORD id);
 
     // Return HMENU for the menu associated with the commandbar
     virtual bool MSWCommand(WXUINT param, WXWORD id);
 
     // Return HMENU for the menu associated with the commandbar


@@ -149,7 +149,8 @@ protected:
                                           wxObject *clientData,
                                           const wxString& shortHelp,
                                           const wxString& longHelp);
                                           wxObject *clientData,
                                           const wxString& shortHelp,
                                           const wxString& longHelp);

-    virtual wxToolBarToolBase *CreateTool(wxControl *control);
+    virtual wxToolBarToolBase *CreateTool(wxControl *control,
+                                          const wxString& label);

 
     // The menubar associated with this toolbar
     wxMenuBar*  m_menuBar;
 
     // The menubar associated with this toolbar
     wxMenuBar*  m_menuBar;


@@ -157,7 +158,7 @@ protected:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolMenuBar)
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolMenuBar)

-    DECLARE_NO_COPY_CLASS(wxToolMenuBar)
+    wxDECLARE_NO_COPY_CLASS(wxToolMenuBar);

 };
 
 #endif
 };
 
 #endif