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 9d9244276537f69b62e741b83ed617baf2b2b519..9e7eb0cc27b31f7572d81cb54c1f99acc20dacbc 100644 (file)
--- a/include/wx/msw/wince/tbarwce.h
+++ b/include/wx/msw/wince/tbarwce.h
@@ -29,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);


@@ -39,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


@@ -69,7 +69,7 @@ protected:
 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
 };
 
 #else


@@ -88,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)
     {


@@ -101,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);
 


@@ -158,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