enclose simple-launcher widget into GtkFrame

git-svn-id: file:///svnroot/simple-launcher/trunk@19 3ba93dab-e023-0410-b42a-de7732cf370a

diff --git a/debian/changelog b/debian/changelog
index c7e2955..499bd59 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+simple-launcher (0.3) unstable; urgency=low
+
+  * Enclose the widget into GtkFrame
+
+ -- Mikhail Sobolev <mss@mawhrin.net>  Tue,  5 Dec 2006 23:31:18 +0200
+
 simple-launcher (0.2) unstable; urgency=low
 
   * Updated Section: of the package

diff --git a/simple-launcher.cc b/simple-launcher.cc
index d60f195..219c319 100644 (file)
--- a/simple-launcher.cc
+++ b/simple-launcher.cc
@@ -154,7 +154,7 @@ SimpleLauncherApplet::~SimpleLauncherApplet() {
 bool SimpleLauncherApplet::initWidget() {
   bool have_buttons = false;
 
-  myWidget = gtk_toolbar_new();
+  GtkToolbar *toolbar = GTK_TOOLBAR(gtk_toolbar_new());
 
   for (std::vector<LauncherItem *>::const_iterator it = myItems.begin(); it != myItems.end(); ++it) {
     GtkToolItem *button = gtk_tool_button_new(gtk_image_new_from_pixbuf((*it)->getIcon(26)), 0);
@@ -167,12 +167,15 @@ bool SimpleLauncherApplet::initWidget() {
     have_buttons = true;
   }
 
-  if (!have_buttons) {
-    gtk_widget_destroy(myWidget);
-    myWidget = 0;
+  if (have_buttons) {
+    myWidget = gtk_frame_new("Simple Launcher");
+
+    gtk_container_add(GTK_CONTAINER(myWidget), GTK_WIDGET(toolbar));
+  } else {
+    gtk_widget_destroy(GTK_WIDGET(toolbar));
   }
 
-  return true;
+  return myWidget != 0;
 }
 
 void SimpleLauncherApplet::_button_clicked(GtkToolButton *button, void *self) {