iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

wxSTATIC_BORDER for Windows, wxSIMPLE_BORDER for everything else. It's probably not very pretty but better than no border at all. 

Originally committed to SVN as r1362.
This commit is contained in:
Niels Martin Hansen 2007-07-04 23:53:19 +00:00
parent 964e3b3c8e
commit 43ff836901
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
aegisub/dialog_colorpicker.cpp
View File

@ -46,8 +46,15 @@
#include "options.h" #include "options.h"
#ifdef WIN32
#define STATIC_BORDER_FLAG wxSTATIC_BORDER
#else
#define STATIC_BORDER_FLAG wxSIMPLE_BORDER
#endif
ColorPickerSpectrum::ColorPickerSpectrum(wxWindow *parent, wxWindowID id, wxBitmap *_background, int xx, int yy, PickerDirection _direction) ColorPickerSpectrum::ColorPickerSpectrum(wxWindow *parent, wxWindowID id, wxBitmap *_background, int xx, int yy, PickerDirection _direction)
: wxControl(parent, id, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER), x(xx), y(yy), background(_background), direction(_direction) : wxControl(parent, id, wxDefaultPosition, wxDefaultSize, STATIC_BORDER_FLAG), x(xx), y(yy), background(_background), direction(_direction)
{ {
// empty // empty
} }
@ -149,7 +156,7 @@ void ColorPickerSpectrum::OnMouse(wxMouseEvent &evt)
ColorPickerRecent::ColorPickerRecent(wxWindow *parent, wxWindowID id, int _cols, int _rows, int _cellsize) ColorPickerRecent::ColorPickerRecent(wxWindow *parent, wxWindowID id, int _cols, int _rows, int _cellsize)
: wxControl(parent, id, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER) : wxControl(parent, id, wxDefaultPosition, wxDefaultSize, STATIC_BORDER_FLAG)
, rows(_rows) , rows(_rows)
, cols(_cols) , cols(_cols)
, cellsize(_cellsize) , cellsize(_cellsize)
@ -258,7 +265,7 @@ void ColorPickerRecent::OnSize(wxSizeEvent &evt)
ColorPickerScreenDropper::ColorPickerScreenDropper(wxWindow *parent, wxWindowID id, int _resx, int _resy, int _magnification, bool _integrated_dropper) ColorPickerScreenDropper::ColorPickerScreenDropper(wxWindow *parent, wxWindowID id, int _resx, int _resy, int _magnification, bool _integrated_dropper)
: wxControl(parent, id, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER), resx(_resx), resy(_resy), magnification(_magnification), integrated_dropper(_integrated_dropper) : wxControl(parent, id, wxDefaultPosition, wxDefaultSize, STATIC_BORDER_FLAG), resx(_resx), resy(_resy), magnification(_magnification), integrated_dropper(_integrated_dropper)
{ {
SetClientSize(resx*magnification, resy*magnification); SetClientSize(resx*magnification, resy*magnification);
SetMinSize(GetSize()); SetMinSize(GetSize());
@ -479,7 +486,7 @@ DialogColorPicker::DialogColorPicker(wxWindow *parent, wxColour initial_color)
html_input = new wxTextCtrl(this, SELECTOR_HTML_INPUT, _T(""), wxDefaultPosition, colorinput_size); html_input = new wxTextCtrl(this, SELECTOR_HTML_INPUT, _T(""), wxDefaultPosition, colorinput_size);
preview_bitmap = wxBitmap(40, 40, 24); preview_bitmap = wxBitmap(40, 40, 24);
preview_box = new wxStaticBitmap(this, -1, preview_bitmap, wxDefaultPosition, wxSize(40, 40), wxSTATIC_BORDER); preview_box = new wxStaticBitmap(this, -1, preview_bitmap, wxDefaultPosition, wxSize(40, 40), STATIC_BORDER_FLAG);
recent_box = new ColorPickerRecent(this, SELECTOR_RECENT, 8, 4, 16); recent_box = new ColorPickerRecent(this, SELECTOR_RECENT, 8, 4, 16);