github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

.gtk

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@5631 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2012-12-08 18:58:52 +00:00
parent 0907b4e120
commit c8c7b84a1a
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
rainbow/Gtk/Wnd.cpp
View file

@ -79,13 +79,14 @@ void Ctrl::Create(Ctrl *owner, bool popup)
if(owner && owner->top)
gtk_window_set_transient_for((GtkWindow *)top->window, (GtkWindow *)owner->top->window);
gtk_widget_set_app_paintable(top->window, TRUE);
gtk_widget_show_all(top->window);
isopen = true;
top->im_context = gtk_im_multicontext_new();
gtk_im_context_set_client_window(top->im_context, gdk());
gtk_im_context_set_use_preedit(top->im_context, false);
g_signal_connect(top->im_context, "commit", G_CALLBACK(IMCommit), this);
WndShow(IsShown());
Win& w = wins.Add();
w.ctrl = this;
@ -120,13 +121,13 @@ void Ctrl::SetMouseCursor(const Image& image)
Ctrl *Ctrl::GetOwner()
{
GuiLock __;
return NULL;
return top ? top->owner : NULL;
}
Ctrl *Ctrl::GetActiveCtrl()
{
GuiLock __;
return NULL;
return focusCtrl ? focusCtrl->GetTopCtrl() : NULL;
}
// Vector<Callback> Ctrl::hotkey;
@ -257,6 +258,10 @@ Rect Ctrl::GetWndScreenRect() const
void Ctrl::WndShow0(bool b)
{
GuiLock __;
if(b)
gtk_widget_show_all(top->window);
else
gtk_widget_hide_all(top->window);
}
void Ctrl::WndUpdate0()

3
rainbow/GtkMain/main.cpp
View file

@ -46,9 +46,6 @@ struct MyApp : TopWindow {
virtual void MouseMove(Point p, dword keyflags)
{
pos = p;
DDUMP(pos);
DDUMP(IsVisible());
DDUMP(IsOpen());
Refresh();
}