M src/Window.cc → src/Window.cc

@@ -22,12 +22,12 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Window.cc,v 1.189 2003/06/11 14:51:56 fluxgen Exp $
+// $Id: Window.cc,v 1.190 2003/06/12 14:35:36 fluxgen Exp $
 
 #include "Window.hh"
 
 #include "WinClient.hh"
-#include "i18n.hh"
+#include "I18n.hh"
 #include "fluxbox.hh"
 #include "Screen.hh"
 #include "StringUtil.hh"
@@ -814,7 +814,6 @@ }
 
 
 void FluxboxWindow::grabButtons() {
-    Fluxbox *fluxbox = Fluxbox::instance();
 
     XGrabButton(display, Button1, AnyModifier, 
 		frame().clientArea().window(), True, ButtonPressMask,
@@ -2968,7 +2967,7 @@ 
 
 void FluxboxWindow::startResizing(Window win, int x, int y, bool left) {
     resizing = true;
-    Fluxbox *fluxbox = Fluxbox::instance();
+
     XGrabPointer(display, win, false, ButtonMotionMask | ButtonReleaseMask, 
                  GrabModeAsync, GrabModeAsync, None,
                  (left ? frame().theme().lowerLeftAngleCursor() : frame().theme().lowerRightAngleCursor()),

M src/Window.hh → src/Window.hh

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Window.hh,v 1.76 2003/05/26 04:24:24 rathnor Exp $
+// $Id: Window.hh,v 1.77 2003/06/12 14:34:28 fluxgen Exp $
 
 #ifndef	 WINDOW_HH
 #define	 WINDOW_HH
@@ -346,6 +346,7 @@ // during certain operations
 
 private:
     void init();
+    /// applies a shape mask to the window if it has one
     void shape();
 
     void grabButtons();
@@ -371,8 +372,6 @@ void getBlackboxHints();
     void saveBlackboxHints();
     void setNetWMAttributes();
     void associateClientWindow();
-    void createWinButtons();
-    void decorateLabel();
 	
     void restoreGravity();
     void setGravityOffsets();
@@ -396,6 +395,7 @@ 
     // Window states
     bool moving, resizing, shaded, maximized, iconic,
         focused, stuck, send_focus_message, m_managed;
+
     WinClient *m_attaching_tab;
 
     BScreen &m_screen; /// screen on which this window exist