mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-19 04:20:27 +01:00
WPrefs: Removed unused Screen argument to the 'Init*' functions
The functions that create the different configuration panels were taking the screen structure as argument, but it turns out that none of them actually need it. We just remove the argument to make code simpler and easier to maintain. Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
committed by
Carlos R. Mafra
parent
fb9765c0f8
commit
ce1513f89f
@@ -2060,7 +2060,7 @@ static void prepareForClose(_Panel * panel)
|
|||||||
WMSynchronizeUserDefaults(udb);
|
WMSynchronizeUserDefaults(udb);
|
||||||
}
|
}
|
||||||
|
|
||||||
Panel *InitAppearance(WMScreen *scr, WMWidget *parent)
|
Panel *InitAppearance(WMWidget *parent)
|
||||||
{
|
{
|
||||||
_Panel *panel;
|
_Panel *panel;
|
||||||
|
|
||||||
|
|||||||
@@ -425,7 +425,7 @@ static void storeData(_Panel *panel)
|
|||||||
SetIntegerForKey(WMGetSliderValue(panel->dithS), "ColormapSize");
|
SetIntegerForKey(WMGetSliderValue(panel->dithS), "ColormapSize");
|
||||||
}
|
}
|
||||||
|
|
||||||
Panel *InitConfigurations(WMScreen *scr, WMWidget *parent)
|
Panel *InitConfigurations(WMWidget *parent)
|
||||||
{
|
{
|
||||||
_Panel *panel;
|
_Panel *panel;
|
||||||
|
|
||||||
|
|||||||
@@ -302,7 +302,7 @@ static void showData(_Panel *panel)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Panel *InitDocks(WMScreen *scr, WMWidget *parent)
|
Panel *InitDocks(WMWidget *parent)
|
||||||
{
|
{
|
||||||
_Panel *panel;
|
_Panel *panel;
|
||||||
|
|
||||||
|
|||||||
@@ -165,7 +165,7 @@ static void storeDefaults(_Panel * panel)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Panel *InitExpert(WMScreen * scr, WMWidget * parent)
|
Panel *InitExpert(WMWidget *parent)
|
||||||
{
|
{
|
||||||
_Panel *panel;
|
_Panel *panel;
|
||||||
|
|
||||||
|
|||||||
@@ -333,7 +333,7 @@ static void createPanel(Panel * p)
|
|||||||
showData(panel);
|
showData(panel);
|
||||||
}
|
}
|
||||||
|
|
||||||
Panel *InitFocus(WMScreen *scr, WMWidget *parent)
|
Panel *InitFocus(WMWidget *parent)
|
||||||
{
|
{
|
||||||
_Panel *panel;
|
_Panel *panel;
|
||||||
|
|
||||||
|
|||||||
@@ -716,7 +716,7 @@ static void createPanel(Panel * p)
|
|||||||
showData(panel);
|
showData(panel);
|
||||||
}
|
}
|
||||||
|
|
||||||
Panel *InitFontSimple(WMScreen * scr, WMWidget * parent)
|
Panel *InitFontSimple(WMWidget *parent)
|
||||||
{
|
{
|
||||||
_Panel *panel;
|
_Panel *panel;
|
||||||
|
|
||||||
|
|||||||
@@ -320,7 +320,7 @@ static void storeData(_Panel * panel)
|
|||||||
SetStringForKey("none", "IconificationStyle");
|
SetStringForKey("none", "IconificationStyle");
|
||||||
}
|
}
|
||||||
|
|
||||||
Panel *InitIcons(WMScreen * scr, WMWidget * parent)
|
Panel *InitIcons(WMWidget *parent)
|
||||||
{
|
{
|
||||||
_Panel *panel;
|
_Panel *panel;
|
||||||
|
|
||||||
|
|||||||
@@ -155,7 +155,7 @@ static void createPanel(Panel * p)
|
|||||||
WMMapSubwidgets(panel->box);
|
WMMapSubwidgets(panel->box);
|
||||||
}
|
}
|
||||||
|
|
||||||
Panel *InitKeyboardSettings(WMScreen * scr, WMWidget * parent)
|
Panel *InitKeyboardSettings(WMWidget *parent)
|
||||||
{
|
{
|
||||||
_Panel *panel;
|
_Panel *panel;
|
||||||
|
|
||||||
|
|||||||
@@ -581,7 +581,7 @@ static void storeData(_Panel * panel)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Panel *InitKeyboardShortcuts(WMScreen * scr, WMWidget * parent)
|
Panel *InitKeyboardShortcuts(WMWidget *parent)
|
||||||
{
|
{
|
||||||
_Panel *panel;
|
_Panel *panel;
|
||||||
|
|
||||||
|
|||||||
@@ -1734,7 +1734,7 @@ static void hideMenus(_Panel * panel)
|
|||||||
WEditMenuHide(panel->menu);
|
WEditMenuHide(panel->menu);
|
||||||
}
|
}
|
||||||
|
|
||||||
Panel *InitMenu(WMScreen * scr, WMWidget * parent)
|
Panel *InitMenu(WMWidget *parent)
|
||||||
{
|
{
|
||||||
_Panel *panel;
|
_Panel *panel;
|
||||||
|
|
||||||
|
|||||||
@@ -213,7 +213,7 @@ static void createPanel(Panel * p)
|
|||||||
showData(panel);
|
showData(panel);
|
||||||
}
|
}
|
||||||
|
|
||||||
Panel *InitMenuPreferences(WMScreen * scr, WMWidget * parent)
|
Panel *InitMenuPreferences(WMWidget *parent)
|
||||||
{
|
{
|
||||||
_Panel *panel;
|
_Panel *panel;
|
||||||
|
|
||||||
|
|||||||
@@ -774,7 +774,7 @@ static void storeData(_Panel * panel)
|
|||||||
wfree(tmp);
|
wfree(tmp);
|
||||||
}
|
}
|
||||||
|
|
||||||
Panel *InitMouseSettings(WMScreen * scr, WMWidget * parent)
|
Panel *InitMouseSettings(WMWidget *parent)
|
||||||
{
|
{
|
||||||
_Panel *panel;
|
_Panel *panel;
|
||||||
|
|
||||||
|
|||||||
@@ -305,7 +305,7 @@ static void createPanel(Panel * p)
|
|||||||
showData(panel);
|
showData(panel);
|
||||||
}
|
}
|
||||||
|
|
||||||
Panel *InitPaths(WMScreen * scr, WMWidget * parent)
|
Panel *InitPaths(WMWidget *parent)
|
||||||
{
|
{
|
||||||
_Panel *panel;
|
_Panel *panel;
|
||||||
|
|
||||||
|
|||||||
@@ -326,7 +326,7 @@ static void createPanel(Panel * p)
|
|||||||
showData(panel);
|
showData(panel);
|
||||||
}
|
}
|
||||||
|
|
||||||
Panel *InitPreferences(WMScreen * scr, WMWidget * parent)
|
Panel *InitPreferences(WMWidget *parent)
|
||||||
{
|
{
|
||||||
_Panel *panel;
|
_Panel *panel;
|
||||||
|
|
||||||
|
|||||||
@@ -202,7 +202,7 @@ static void storeData(_Panel * panel)
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
Panel *InitThemes(WMScreen * scr, WMWidget * parent)
|
Panel *InitThemes(WMWidget *parent)
|
||||||
{
|
{
|
||||||
_Panel *panel;
|
_Panel *panel;
|
||||||
|
|
||||||
|
|||||||
@@ -645,34 +645,34 @@ void Initialize(WMScreen * scr)
|
|||||||
|
|
||||||
WMSetLabelText(WPrefs.statusL, _("Initializing configuration panels..."));
|
WMSetLabelText(WPrefs.statusL, _("Initializing configuration panels..."));
|
||||||
|
|
||||||
InitFocus(scr, WPrefs.banner);
|
InitFocus(WPrefs.banner);
|
||||||
InitWindowHandling(scr, WPrefs.banner);
|
InitWindowHandling(WPrefs.banner);
|
||||||
|
|
||||||
InitMenuPreferences(scr, WPrefs.banner);
|
InitMenuPreferences(WPrefs.banner);
|
||||||
InitIcons(scr, WPrefs.banner);
|
InitIcons(WPrefs.banner);
|
||||||
InitPreferences(scr, WPrefs.banner);
|
InitPreferences(WPrefs.banner);
|
||||||
|
|
||||||
InitPaths(scr, WPrefs.banner);
|
InitPaths(WPrefs.banner);
|
||||||
InitDocks(scr, WPrefs.banner);
|
InitDocks(WPrefs.banner);
|
||||||
InitWorkspace(scr, WPrefs.banner);
|
InitWorkspace(WPrefs.banner);
|
||||||
InitConfigurations(scr, WPrefs.banner);
|
InitConfigurations(WPrefs.banner);
|
||||||
|
|
||||||
InitMenu(scr, WPrefs.banner);
|
InitMenu(WPrefs.banner);
|
||||||
|
|
||||||
#ifdef not_yet_fully_implemented
|
#ifdef not_yet_fully_implemented
|
||||||
InitKeyboardSettings(scr, WPrefs.banner);
|
InitKeyboardSettings(WPrefs.banner);
|
||||||
#endif
|
#endif
|
||||||
InitKeyboardShortcuts(scr, WPrefs.banner);
|
InitKeyboardShortcuts(WPrefs.banner);
|
||||||
InitMouseSettings(scr, WPrefs.banner);
|
InitMouseSettings(WPrefs.banner);
|
||||||
|
|
||||||
InitAppearance(scr, WPrefs.banner);
|
InitAppearance(WPrefs.banner);
|
||||||
|
|
||||||
InitFontSimple(scr, WPrefs.banner);
|
InitFontSimple(WPrefs.banner);
|
||||||
|
|
||||||
#ifdef not_yet_fully_implemented
|
#ifdef not_yet_fully_implemented
|
||||||
InitThemes(scr, WPrefs.banner);
|
InitThemes(WPrefs.banner);
|
||||||
#endif
|
#endif
|
||||||
InitExpert(scr, WPrefs.banner);
|
InitExpert(WPrefs.banner);
|
||||||
|
|
||||||
WMRealizeWidget(WPrefs.scrollV);
|
WMRealizeWidget(WPrefs.scrollV);
|
||||||
|
|
||||||
|
|||||||
@@ -136,21 +136,21 @@ int ModifierFromKey(Display * dpy, const char *key);
|
|||||||
void Initialize(WMScreen *scr);
|
void Initialize(WMScreen *scr);
|
||||||
|
|
||||||
/* in alphabetical order - in case you'd want to add one */
|
/* in alphabetical order - in case you'd want to add one */
|
||||||
Panel *InitAppearance(WMScreen *scr, WMWidget *parent);
|
Panel *InitAppearance(WMWidget *parent);
|
||||||
Panel *InitConfigurations(WMScreen *scr, WMWidget *parent);
|
Panel *InitConfigurations(WMWidget *parent);
|
||||||
Panel *InitDocks(WMScreen *scr, WMWidget *parent);
|
Panel *InitDocks(WMWidget *parent);
|
||||||
Panel *InitExpert(WMScreen *scr, WMWidget *parent);
|
Panel *InitExpert(WMWidget *parent);
|
||||||
Panel *InitFocus(WMScreen *scr, WMWidget *parent);
|
Panel *InitFocus(WMWidget *parent);
|
||||||
Panel *InitFontSimple(WMScreen *scr, WMWidget *parent);
|
Panel *InitFontSimple(WMWidget *parent);
|
||||||
Panel *InitIcons(WMScreen *scr, WMWidget *parent);
|
Panel *InitIcons(WMWidget *parent);
|
||||||
Panel *InitKeyboardShortcuts(WMScreen *scr, WMWidget *parent);
|
Panel *InitKeyboardShortcuts(WMWidget *parent);
|
||||||
Panel *InitMenu(WMScreen *scr, WMWidget *parent);
|
Panel *InitMenu(WMWidget *parent);
|
||||||
Panel *InitMenuPreferences(WMScreen *scr, WMWidget *parent);
|
Panel *InitMenuPreferences(WMWidget *parent);
|
||||||
Panel *InitMouseSettings(WMScreen *scr, WMWidget *parent);
|
Panel *InitMouseSettings(WMWidget *parent);
|
||||||
Panel *InitPaths(WMScreen *scr, WMWidget *parent);
|
Panel *InitPaths(WMWidget *parent);
|
||||||
Panel *InitPreferences(WMScreen *scr, WMWidget *parent);
|
Panel *InitPreferences(WMWidget *parent);
|
||||||
Panel *InitWindowHandling(WMScreen *scr, WMWidget *parent);
|
Panel *InitWindowHandling(WMWidget *parent);
|
||||||
Panel *InitWorkspace(WMScreen *scr, WMWidget *parent);
|
Panel *InitWorkspace(WMWidget *parent);
|
||||||
|
|
||||||
|
|
||||||
#define FRAME_TOP 105
|
#define FRAME_TOP 105
|
||||||
|
|||||||
@@ -515,7 +515,7 @@ static void undo(_Panel * panel)
|
|||||||
showData(panel);
|
showData(panel);
|
||||||
}
|
}
|
||||||
|
|
||||||
Panel *InitWindowHandling(WMScreen * scr, WMWidget * parent)
|
Panel *InitWindowHandling(WMWidget *parent)
|
||||||
{
|
{
|
||||||
_Panel *panel;
|
_Panel *panel;
|
||||||
|
|
||||||
|
|||||||
@@ -215,7 +215,7 @@ static void storeData(_Panel * panel)
|
|||||||
"WorkspaceNameDisplayPosition");
|
"WorkspaceNameDisplayPosition");
|
||||||
}
|
}
|
||||||
|
|
||||||
Panel *InitWorkspace(WMScreen * scr, WMWidget * parent)
|
Panel *InitWorkspace(WMWidget *parent)
|
||||||
{
|
{
|
||||||
_Panel *panel;
|
_Panel *panel;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user