Permalink
Browse files

fix wxST_SIZEGRIP to new sytax wxSTB_SIZEGRIP

  • Loading branch information...
Jim Maciejewski
Jim Maciejewski committed Oct 5, 2017
1 parent 6574c69 commit 07508bacb33618a93f957895f2f19ce29333de6c
Showing with 5 additions and 5 deletions.
  1. +1 −1 output/plugins/common/xml/menutoolbar.xml
  2. +2 −2 plugins/common/common.cpp
  3. +1 −1 wxfbTest/wxfbTest.fbp
  4. +1 −1 wxfbTest/wxfbTest_GUI.cpp
@@ -27,7 +27,7 @@ Written by
<property name="name" type="text">m_statusBar</property>
<property name="fields" type="uint" help="Number of fields in the statusbar.">1</property>
<property name="style" type="bitlist">
<option name="wxST_SIZEGRIP" help="On Windows, displays a gripper at right-hand side of the status bar." />wxST_SIZEGRIP</property>
<option name="wxSTB_SIZEGRIP" help="On Windows, displays a gripper at right-hand side of the status bar." />wxSTB_SIZEGRIP</property>
</objectinfo>
<objectinfo class="wxMenuBar" icon="menubar.xpm" type="menubar" startgroup="1">
@@ -47,7 +47,7 @@
class wxIndependentStatusBar : public wxStatusBar
{
public:
wxIndependentStatusBar( wxWindow *parent, wxWindowID id = wxID_ANY, long style = wxST_SIZEGRIP, const wxString& name = wxStatusBarNameStr )
wxIndependentStatusBar( wxWindow *parent, wxWindowID id = wxID_ANY, long style = wxSTB_SIZEGRIP, const wxString& name = wxStatusBarNameStr )
:
wxStatusBar( parent, id, style, name )
{
@@ -1767,7 +1767,7 @@ MACRO(wxRB_USE_CHECKBOX)
#endif
// wxStatusBar
MACRO(wxST_SIZEGRIP)
MACRO(wxSTB_SIZEGRIP)
// wxMenuBar
MACRO(wxMB_DOCKABLE)
View
@@ -162,7 +162,7 @@ Created with wxFormBuilder by:
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style">wxST_SIZEGRIP</property>
<property name="style">wxSTB_SIZEGRIP</property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
@@ -60,7 +60,7 @@ MainFrame::MainFrame( wxWindow* parent, int id, wxString title, wxPoint pos, wxS
this->SetMenuBar( m_menubar1 );
m_statusBar1 = this->CreateStatusBar( 1, wxST_SIZEGRIP, ID_DEFAULT );
m_statusBar1 = this->CreateStatusBar( 1, wxSTB_SIZEGRIP, ID_DEFAULT );
m_toolBar1 = this->CreateToolBar( wxTB_HORIZONTAL, ID_DEFAULT );
m_toolBar1->AddTool( ID_DEFAULT, wxT("tool"), wxBitmap( copy_xpm ), wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString );
m_toolBar1->AddTool( ID_DEFAULT, wxT("tool"), wxBitmap( cut_xpm ), wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString );

0 comments on commit 07508ba

Please sign in to comment.