Skip to content
Snippets Groups Projects
Commit 0d99b783 authored by deuce's avatar deuce
Browse files

The Hide()/Show() hack is not Win32 only.

Also, go back to iconizing... rather than lowering *sigh*
parent 22b033a0
No related branches found
No related tags found
No related merge requests found
...@@ -182,7 +182,12 @@ void MyHTML::OnState(wxCommandEvent &event) ...@@ -182,7 +182,12 @@ void MyHTML::OnState(wxCommandEvent &event)
UnHide(); UnHide();
if(frame->IsIconized()) if(frame->IsIconized())
frame->Iconize(false); frame->Iconize(false);
#ifdef _WIN32
frame->Hide();
#endif
frame->Show();
frame->Raise(); frame->Raise();
htmlWindow->Show();
htmlWindow->Raise(); htmlWindow->Raise();
htmlWindow->SetFocus(); htmlWindow->SetFocus();
break; break;
...@@ -377,7 +382,7 @@ extern "C" { ...@@ -377,7 +382,7 @@ extern "C" {
str[1]=0; str[1]=0;
add_html(str); add_html(str);
} }
void show_html(const char *page) void show_html(const char *page)
{ {
if(wxTheApp) { if(wxTheApp) {
......
...@@ -40,7 +40,7 @@ static struct text_info log_ti; ...@@ -40,7 +40,7 @@ static struct text_info log_ti;
#ifdef WITH_WXWIDGETS #ifdef WITH_WXWIDGETS
enum html_mode { enum html_mode {
HTML_MODE_HIDDEN HTML_MODE_HIDDEN
,HTML_MODE_LOWERED ,HTML_MODE_ICONIZED
,HTML_MODE_RAISED ,HTML_MODE_RAISED
,HTML_MODE_READING ,HTML_MODE_READING
}; };
...@@ -1387,8 +1387,8 @@ BOOL doterm(struct bbslist *bbs) ...@@ -1387,8 +1387,8 @@ BOOL doterm(struct bbslist *bbs)
#ifdef WITH_WXWIDGETS #ifdef WITH_WXWIDGETS
if(html_mode==HTML_MODE_RAISED) { if(html_mode==HTML_MODE_RAISED) {
if(html_startx!=wherex() || html_starty!=wherey()) { if(html_startx!=wherex() || html_starty!=wherey()) {
lower_html(); iconize_html();
html_mode=HTML_MODE_LOWERED; html_mode=HTML_MODE_ICONIZED;
} }
} }
#endif #endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment