src/src/debuggersettingsdlg.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/src/debuggersettingsdlg.cpp b/src/src/debuggersettingsdlg.cpp
index 68bfe67dd..9fdf9ee6d 100644
--- a/src/src/debuggersettingsdlg.cpp
+++ b/src/src/debuggersettingsdlg.cpp
@@ -3,8 +3,8 @@
#ifndef CB_PRECOMP
//(*InternalHeadersPCH(DebuggerSettingsDlg)
- #include <wx/string.h>
#include <wx/intl.h>
+ #include <wx/string.h>
//*)
#include <wx/choicdlg.h>
@@ -35,18 +35,18 @@ END_EVENT_TABLE()
DebuggerSettingsDlg::DebuggerSettingsDlg(wxWindow* parent)
{
//(*Initialize(DebuggerSettingsDlg)
- wxStaticLine* staticLine;
wxBoxSizer* headerSizer;
wxBoxSizer* mainSizer;
- wxStdDialogButtonSizer* stdDialogButtons;
wxPanel* header;
+ wxStaticLine* staticLine;
+ wxStdDialogButtonSizer* stdDialogButtons;
Create(parent, wxID_ANY, _("Debugger settings"), wxDefaultPosition, wxDefaultSize, wxCAPTION|wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxCLOSE_BOX|wxMAXIMIZE_BOX|wxMINIMIZE_BOX, _T("wxID_ANY"));
mainSizer = new wxBoxSizer(wxVERTICAL);
- header = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTRANSPARENT_WINDOW, _T("wxID_ANY"));
+ header = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE|wxTRANSPARENT_WINDOW, _T("wxID_ANY"));
header->SetBackgroundColour(wxColour(0,64,128));
headerSizer = new wxBoxSizer(wxHORIZONTAL);
- m_activeInfo = new wxStaticText(header, ID_LABEL_ACTIVE_INFO, _("Active debugger config"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTRANSPARENT_WINDOW, _T("ID_LABEL_ACTIVE_INFO"));
+ m_activeInfo = new wxStaticText(header, ID_LABEL_ACTIVE_INFO, _("Active debugger config"), wxDefaultPosition, wxDefaultSize, wxBORDER_NONE|wxTRANSPARENT_WINDOW, _T("ID_LABEL_ACTIVE_INFO"));
m_activeInfo->SetForegroundColour(wxColour(255,255,255));
m_activeInfo->SetBackgroundColour(wxColour(0,64,128));
wxFont m_activeInfoFont(12,wxFONTFAMILY_DEFAULT,wxFONTSTYLE_NORMAL,wxFONTWEIGHT_BOLD,false,wxEmptyString,wxFONTENCODING_DEFAULT);
src/src/debuggersettingsdlg.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/src/debuggersettingsdlg.h b/src/src/debuggersettingsdlg.h
index 9ab0523f7..749848bb4 100644
--- a/src/src/debuggersettingsdlg.h
+++ b/src/src/debuggersettingsdlg.h
@@ -3,9 +3,9 @@
#ifndef CB_PRECOMP
//(*HeadersPCH(DebuggerSettingsDlg)
- #include <wx/sizer.h>
- #include <wx/panel.h>
#include "scrollingdialog.h"
+ #include <wx/panel.h>
+ #include <wx/sizer.h>
#include <wx/stattext.h>
//*)
@@ -40,8 +40,8 @@ class DebuggerSettingsDlg: public wxScrollingDialog
private:
//(*Declarations(DebuggerSettingsDlg)
- wxTreebook* m_treebook;
wxStaticText* m_activeInfo;
+ wxTreebook* m_treebook;
//*)
//(*Identifiers(DebuggerSettingsDlg)